From e9017ba418202b4b191c5a9ad4a96857558ce606 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 17:22:58 +0200
Subject: Use _OBJ_FILES variables in a couple more places. (This used to be
 commit 92856d5054106894b65cd1a1b5119c0facfc4cff)

---
 source4/lib/tdb/config.mk | 25 +++++++++++++------------
 source4/lib/tdb/python.mk |  2 ++
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'source4/lib/tdb')

diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 76342dc8fa..b9a8f80dda 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -2,55 +2,56 @@
 # Start SUBSYSTEM LIBTDB
 [LIBRARY::LIBTDB]
 OUTPUT_TYPE = STATIC_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
 CFLAGS = -Ilib/tdb/include
 #
 # 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
-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
-OBJ_FILES= \
-		tools/tdbbackup.o
 PRIVATE_DEPENDENCIES = \
 		LIBTDB
 # End BINARY tdbbackup
 ################################################
+
+tdbbackup_OBJ_FILES = lib/tdb/tools/tdbbackup.o
diff --git a/source4/lib/tdb/python.mk b/source4/lib/tdb/python.mk
index 23b01c120c..2d61545b7f 100644
--- a/source4/lib/tdb/python.mk
+++ b/source4/lib/tdb/python.mk
@@ -1,3 +1,5 @@
 [PYTHON::swig_tdb]
 SWIG_FILE = tdb.i
 PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
+
+swig_tdb_OBJ_FILES = lib/tdb/tdb_wrap.o
-- 
cgit