Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

[kai/samba-autobuild/.git] / source4 / lib / tdb / config.mk

diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 1dbe26428b57a61a0160613e43f5de3d8574db8e..b9a8f80dda597dabffd2fde9d551a3e28f986325 100644 (file)
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -1,72 +1,57 @@
 ################################################
 # Start SUBSYSTEM LIBTDB
 [LIBRARY::LIBTDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = Trivial Database Library
-OBJ_FILES = \
-       common/tdb.o common/dump.o common/io.o common/lock.o \
-       common/open.o common/traverse.o common/freelist.o \
-       common/error.o common/transaction.o common/tdbutil.o
+OUTPUT_TYPE = STATIC_LIBRARY
 CFLAGS = -Ilib/tdb/include
-PUBLIC_DEPENDENCIES = \
-               LIBREPLACE
-PUBLIC_HEADERS = include/tdb.h
 #
 # End SUBSYSTEM ldb
 ################################################
 
+LIBTDB_OBJ_FILES = $(addprefix lib/tdb/common/, \
+       tdb.o dump.o io.o lock.o \
+       open.o traverse.o freelist.o \
+       error.o transaction.o)
+
 ################################################
 # Start BINARY tdbtool
 [BINARY::tdbtool]
 INSTALLDIR = BINDIR
-ENABLE = NO
-OBJ_FILES= \
-               tools/tdbtool.o
 PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbtool
 ################################################
 
+tdbtool_OBJ_FILES = lib/tdb/tools/tdbtool.o
+
 ################################################
 # Start BINARY tdbtorture
 [BINARY::tdbtorture]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/tdbtorture.o
 PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbtorture
 ################################################
 
+tdbtorture_OBJ_FILES = lib/tdb/tools/tdbtorture.o
+
 ################################################
 # Start BINARY tdbdump
 [BINARY::tdbdump]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/tdbdump.o
 PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbdump
 ################################################
 
+tdbdump_OBJ_FILES = lib/tdb/tools/tdbdump.o
+
 ################################################
 # Start BINARY tdbbackup
 [BINARY::tdbbackup]
 INSTALLDIR = BINDIR
-ENABLE = NO
-OBJ_FILES= \
-               tools/tdbbackup.o
 PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbbackup
 ################################################
 
-#######################
-# Start LIBRARY swig_tdb
-[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
-OBJ_FILES = swig/tdb_wrap.o
-PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
-# End LIBRARY swig_tdb
-#######################
+tdbbackup_OBJ_FILES = lib/tdb/tools/tdbbackup.o