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

[samba.git] / source / lib / tdb / config.mk

diff --git a/source/lib/tdb/config.mk b/source/lib/tdb/config.mk
index 06f97547bbca95ac44e14888bc55a25159fff8f8..b9a8f80dda597dabffd2fde9d551a3e28f986325 100644 (file)
--- a/source/lib/tdb/config.mk
+++ b/source/lib/tdb/config.mk
@@ -1,74 +1,57 @@
 ################################################
 # Start SUBSYSTEM LIBTDB
-[SUBSYSTEM::LIBTDB]
-INIT_OBJ_FILES = \
-               lib/tdb/common/tdb.o
-ADD_OBJ_FILES = \
-               lib/tdb/common/tdbutil.o \
-               lib/tdb/common/spinlock.o
+[LIBRARY::LIBTDB]
+OUTPUT_TYPE = STATIC_LIBRARY
+CFLAGS = -Ilib/tdb/include
 #
-# End SUBSYSTEM LIBLDB
+# End SUBSYSTEM ldb
 ################################################
 
-################################################
-# Start LIBRARY LIBTDB
-[LIBRARY::libtdb]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = \
-               LIBTDB
-#
-# End LIBRARY LIBLDB
-################################################
-
-################################################
-# Start BINARY tdbtest
-[BINARY::tdbtest]
-OBJ_FILES= \
-               lib/tdb/tools/tdbtest.o
-REQUIRED_SUBSYSTEMS = \
-               LIBTDB
-REQUIRED_LIBRARIES = GDBM
-# End BINARY tdbtest
-################################################
+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]
-OBJ_FILES= \
-               lib/tdb/tools/tdbtool.o
-REQUIRED_SUBSYSTEMS = \
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbtool
 ################################################
 
+tdbtool_OBJ_FILES = lib/tdb/tools/tdbtool.o
+
 ################################################
 # Start BINARY tdbtorture
 [BINARY::tdbtorture]
-OBJ_FILES= \
-               lib/tdb/tools/tdbtorture.o
-REQUIRED_SUBSYSTEMS = \
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbtorture
 ################################################
 
+tdbtorture_OBJ_FILES = lib/tdb/tools/tdbtorture.o
+
 ################################################
 # Start BINARY tdbdump
 [BINARY::tdbdump]
-OBJ_FILES= \
-               lib/tdb/tools/tdbdump.o
-REQUIRED_SUBSYSTEMS = \
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbdump
 ################################################
 
+tdbdump_OBJ_FILES = lib/tdb/tools/tdbdump.o
+
 ################################################
 # Start BINARY tdbbackup
 [BINARY::tdbbackup]
-OBJ_FILES= \
-               lib/tdb/tools/tdbbackup.o
-REQUIRED_SUBSYSTEMS = \
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
                LIBTDB
 # End BINARY tdbbackup
 ################################################
+
+tdbbackup_OBJ_FILES = lib/tdb/tools/tdbbackup.o