Move object file lists to the Makefile.

(This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6)

1 files changed, 18 insertions, 24 deletions

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index b2d7ce202e..728d64d552 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -1,6 +1,7 @@
 [SUBSYSTEM::TDR_REGF]
 PUBLIC_DEPENDENCIES = TDR 
-OBJ_FILES = tdr_regf.o
+
+TDR_REGF_OBJ_FILES = lib/registry/tdr_regf.o
 
 # Special support for external builddirs
 lib/registry/regf.c: lib/registry/tdr_regf.c
@@ -20,91 +21,84 @@ clean::
 VERSION = 0.0.1
 PC_FILE = registry.pc
 SO_VERSION = 0
-OBJ_FILES = \
-		interface.o \
-		util.o \
-		samba.o \
-		patchfile_dotreg.o \
-		patchfile_preg.o \
-		patchfile.o \
-		regf.o \
-		hive.o \
-		local.o \
-		ldb.o \
-		dir.o \
-		rpc.o
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
 		RPC_NDR_WINREG LDB_WRAP
 # End MODULE registry_ldb
 ################################################
 
+registry_OBJ_FILES = $(addprefix lib/registry/, interface.o util.o samba.o \
+					patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
+					hive.o local.o ldb.o dir.o rpc.o)
+
 PUBLIC_HEADERS += $(addprefix lib/registry/, registry.h hive.h patchfile.h)
 
 [SUBSYSTEM::registry_common]
 PUBLIC_DEPENDENCIES = registry
-OBJ_FILES = tools/common.o
 PRIVATE_PROTO_HEADER = tools/common.h
 
+registry_common_OBJ_FILES = lib/registry/tools/common.o
+
 ################################################
 # Start BINARY regdiff
 [BINARY::regdiff]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regdiff.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 # End BINARY regdiff
 ################################################
 
+regdiff_OBJ_FILES = lib/registry/tools/regdiff.o
+
 MANPAGES += lib/registry/man/regdiff.1
 
 ################################################
 # Start BINARY regpatch
 [BINARY::regpatch]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regpatch.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
 		registry_common
 # End BINARY regpatch
 ################################################
 
+regpatch_OBJ_FILES = lib/registry/tools/regpatch.o
+
 MANPAGES += lib/registry/man/regpatch.1
 
 ################################################
 # Start BINARY regshell
 [BINARY::regshell]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regshell.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
 		SMBREADLINE registry_common
 # End BINARY regshell
 ################################################
 
+regshell_OBJ_FILES = lib/registry/tools/regshell.o
+
 MANPAGES += lib/registry/man/regshell.1
 
 ################################################
 # Start BINARY regtree
 [BINARY::regtree]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regtree.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
 		registry_common
 # End BINARY regtree
 ################################################
 
+regtree_OBJ_FILES = lib/registry/tools/regtree.o
+
 MANPAGES += lib/registry/man/regtree.1
 
 [SUBSYSTEM::torture_registry]
 PRIVATE_DEPENDENCIES = registry
 PRIVATE_PROTO_HEADER = tests/proto.h
-OBJ_FILES = \
-		tests/generic.o \
-		tests/hive.o \
-		tests/diff.o \
-		tests/registry.o
+
+torture_registry_OBJ_FILES = $(addprefix lib/registry/tests/, generic.o hive.o diff.o registry.o)
 
 [PYTHON::swig_registry]
 PUBLIC_DEPENDENCIES = registry