Move object file lists to the Makefile.

(This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6)

25 files changed, 162 insertions, 200 deletions

diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk
index df0f81dccb..c0bba35ba5 100644
--- a/source4/lib/appweb/config.mk
+++ b/source4/lib/appweb/config.mk
@@ -1,31 +1,25 @@
 #######################
 # Start SUBSYSTEM MPR
 [SUBSYSTEM::MPR]
-OBJ_FILES = \
-		mpr/miniMpr.o \
-		mpr/var.o
 # End SUBSYSTEM MPR
 #######################
 
+MPR_OBJ_FILES = $(addprefix lib/appweb/mpr/, miniMpr.o var.o)
 
 #######################
 # Start SUBSYSTEM EJS
 [SUBSYSTEM::EJS]
-OBJ_FILES = \
-		ejs/ejsLib.o  \
-		ejs/ejsLex.o \
-		ejs/ejsParser.o \
-		ejs/ejsProcs.o
 PUBLIC_DEPENDENCIES = MPR
 # End SUBSYSTEM EJS
 #######################
 
+EJS_OBJ_FILES = $(addprefix lib/appweb/ejs/, ejsLib.o ejsLex.o ejsParser.o ejsProcs.o)
+
 #######################
 # Start SUBSYSTEM ESP
 [SUBSYSTEM::ESP]
-OBJ_FILES = \
-		esp/esp.o  \
-		esp/espProcs.o
 PUBLIC_DEPENDENCIES = EJS
 # End SUBSYSTEM ESP
 #######################
+
+ESP_OBJ_FILES = $(addprefix lib/appweb/esp/, esp.o espProcs.o)
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index d059bdf49b..f6a8731a21 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -19,26 +19,25 @@ mkinclude dbwrap/config.mk
 mkinclude crypto/config.mk
 
 [SUBSYSTEM::LIBCOMPRESSION]
-OBJ_FILES = compression/mszip.o
+
+LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
 
 [SUBSYSTEM::GENCACHE]
-OBJ_FILES = gencache/gencache.o
 PRIVATE_DEPENDENCIES = TDB_WRAP
 
+GENCACHE_OBJ_FILES = gencache/gencache.o
 
 PUBLIC_HEADERS += lib/gencache/gencache.h
 
 [SUBSYSTEM::LDB_WRAP]
-OBJ_FILES = ldb_wrap.o
 PUBLIC_DEPENDENCIES = LIBLDB
 PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
 
-
+LDB_WRAP_OBJ_FILES = lib/ldb_wrap.o
 PUBLIC_HEADERS += lib/ldb_wrap.h
 
 [SUBSYSTEM::TDB_WRAP]
-OBJ_FILES = tdb_wrap.o
 PUBLIC_DEPENDENCIES = LIBTDB
 
-
+TDB_WRAP_OBJ_FILES = lib/tdb_wrap.o
 PUBLIC_HEADERS += lib/tdb_wrap.h
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index 2766784c52..e5e5bd4560 100644
--- a/source4/lib/charset/config.mk
+++ b/source4/lib/charset/config.mk
@@ -1,15 +1,12 @@
 ################################################
 # Start SUBSYSTEM CHARSET
 [SUBSYSTEM::CHARSET]
-OBJ_FILES = \
-		iconv.o \
-		charcnv.o \
-		util_unistr.o
 PRIVATE_PROTO_HEADER = charset_proto.h
 PUBLIC_DEPENDENCIES = ICONV
 PRIVATE_DEPENDENCIES = DYNCONFIG
 # End SUBSYSTEM CHARSET
 ################################################
 
+CHARSET_OBJ_FILES = $(addprefix lib/charset/, iconv.o charcnv.o util_unistr.o)
 
 PUBLIC_HEADERS += lib/charset/charset.h
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 87014d4d53..f8a971a063 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,16 +1,19 @@
 [SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
 PRIVATE_PROTO_HEADER = credentials.h
-OBJ_FILES = credentials.o
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
 
+LIBCMDLINE_CREDENTIALS_OBJ_FILES = lib/cmdline/credentials.o
+
 [SUBSYSTEM::POPT_SAMBA]
-OBJ_FILES = popt_common.o
 PUBLIC_DEPENDENCIES = LIBPOPT
 
+POPT_SAMBA_OBJ_FILES = lib/cmdline/popt_common.o
+
 PUBLIC_HEADERS += lib/cmdline/popt_common.h 
 
 [SUBSYSTEM::POPT_CREDENTIALS]
 PRIVATE_PROTO_HEADER = popt_credentials.h
-OBJ_FILES = popt_credentials.o
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
+
+POPT_CREDENTIALS_OBJ_FILES = lib/cmdline/popt_credentials.o
diff --git a/source4/lib/crypto/config.mk b/source4/lib/crypto/config.mk
index f7a8d20604..82dbe4a4cb 100644
--- a/source4/lib/crypto/config.mk
+++ b/source4/lib/crypto/config.mk
@@ -1,26 +1,19 @@
 ##############################
 # Start SUBSYSTEM LIBCRYPTO
 [SUBSYSTEM::LIBCRYPTO]
-OBJ_FILES = \
-		crc32.o \
-		md5.o \
-		hmacmd5.o \
-		md4.o \
-		arcfour.o \
-		sha1.o \
-		hmacsha1.o
 # End SUBSYSTEM LIBCRYPTO
 ##############################
 
+LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
+					 crc32.o md5.o hmacmd5.o md4.o \
+					 arcfour.o sha1.o hmacsha1.o)
+
+
 [MODULE::TORTURE_LIBCRYPTO]
-OBJ_FILES = \
-		md4test.o \
-		md5test.o \
-		hmacmd5test.o \
-		sha1test.o \
-		hmacsha1test.o
 SUBSYSTEM = torture
 PRIVATE_DEPENDENCIES = LIBCRYPTO
 PRIVATE_PROTO_HEADER = test_proto.h
 
+TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
+		md4test.o md5test.o hmacmd5test.o sha1test.o hmacsha1test.o)
 
diff --git a/source4/lib/dbwrap/config.mk b/source4/lib/dbwrap/config.mk
index 01ce4ddd8e..9038873d32 100644
--- a/source4/lib/dbwrap/config.mk
+++ b/source4/lib/dbwrap/config.mk
@@ -1,6 +1,6 @@
 [SUBSYSTEM::LIBDBWRAP]
-OBJ_FILES = dbwrap.o \
-		dbwrap_tdb.o \
-		dbwrap_ctdb.o
 PUBLIC_DEPENDENCIES = \
 		LIBTDB ctdb
+
+LIBDBWRAP_OBJ_FILES = $(addprefix lib/dbwrap/, dbwrap.o dbwrap_tdb.o dbwrap_ctdb.o)
+
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 225a23c634..ba06c2f673 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -1,41 +1,45 @@
 ##############################
 [MODULE::EVENTS_AIO]
-OBJ_FILES = events_aio.o
 PRIVATE_DEPENDENCIES = LIBAIO_LINUX
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_aio_init
 ##############################
 
+EVENTS_AIO_OBJ_FILES = lib/events/events_aio.o
+
 ##############################
 [MODULE::EVENTS_EPOLL]
-OBJ_FILES = events_epoll.o
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_epoll_init
 ##############################
 
+EVENTS_EPOLL_OBJ_FILES = lib/events/events_epoll.o
+
 ##############################
 [MODULE::EVENTS_SELECT]
-OBJ_FILES = events_select.o
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_select_init
 ##############################
 
+EVENTS_SELECT_OBJ_FILES = lib/events/events_select.o
+
 ##############################
 [MODULE::EVENTS_STANDARD]
-OBJ_FILES = events_standard.o
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_standard_init
 ##############################
 
+EVENTS_STANDARD_OBJ_FILES = lib/events/events_standard.o
 
 ##############################
 # Start SUBSYSTEM LIBEVENTS
 [SUBSYSTEM::LIBEVENTS]
-OBJ_FILES = events.o events_timed.o events_signal.o
 PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
 # End SUBSYSTEM LIBEVENTS
 ##############################
 
+LIBEVENTS_OBJ_FILES = $(addprefix lib/events/, events.o events_timed.o events_signal.o)
+
 PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
 
 [PYTHON::swig_events]
diff --git a/source4/lib/ldb-samba/config.mk b/source4/lib/ldb-samba/config.mk
index fa3ac46021..6a0b842fff 100644
--- a/source4/lib/ldb-samba/config.mk
+++ b/source4/lib/ldb-samba/config.mk
@@ -4,9 +4,8 @@
 PUBLIC_DEPENDENCIES = LIBLDB
 PRIVATE_PROTO_HEADER = ldif_handlers.h
 PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_MISC
-OBJ_FILES = \
-		ldif_handlers.o
 # End SUBSYSTEM LDBSAMBA
 ################################################
 
+LDBSAMBA_OBJ_FILES = lib/ldb-samba/ldif_handlers.o
 
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 68c3d21fc9..c33d930ee3 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -5,8 +5,8 @@ PRIVATE_DEPENDENCIES = LIBTALLOC
 CFLAGS = -Ilib/ldb/include
 INIT_FUNCTION = LDB_MODULE(asq)
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		modules/asq.o
+
+LDB_ASQ_OBJ_FILES = lib/ldb/modules/asq.o
 # End MODULE ldb_asq
 ################################################
 
@@ -17,10 +17,10 @@ PRIVATE_DEPENDENCIES = LIBTALLOC
 CFLAGS = -Ilib/ldb/include
 INIT_FUNCTION = LDB_MODULE(server_sort)
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		modules/sort.o
+
 # End MODULE ldb_sort
 ################################################
+ldb_server_sort_OBJ_FILES = lib/ldb/modules/sort.o
 
 ################################################
 # Start MODULE ldb_paged_results
@@ -29,11 +29,11 @@ INIT_FUNCTION = LDB_MODULE(paged_results)
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		modules/paged_results.o
 # End MODULE ldb_paged_results
 ################################################
 
+ldb_pages_results_OBJ_FILES = lib/ldb/modules/paged_results.o
+
 ################################################
 # Start MODULE ldb_paged_results
 [MODULE::ldb_paged_searches]
@@ -41,11 +41,11 @@ INIT_FUNCTION = LDB_MODULE(paged_searches)
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		modules/paged_searches.o
 # End MODULE ldb_paged_results
 ################################################
 
+ldb_paged_searches_OBJ_FILES = lib/ldb/modules/paged_searches.o
+
 ################################################
 # Start MODULE ldb_operational
 [MODULE::ldb_operational]
@@ -53,11 +53,11 @@ SUBSYSTEM = LIBLDB
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = LDB_MODULE(operational)
-OBJ_FILES = \
-		modules/operational.o
 # End MODULE ldb_operational
 ################################################
 
+ldb_operational_OBJ_FILES = lib/ldb/modules/operational.o
+
 ################################################
 # Start MODULE ldb_rdn_name
 [MODULE::ldb_rdn_name]
@@ -65,23 +65,21 @@ SUBSYSTEM = LIBLDB
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = LDB_MODULE(rdn_name)
-OBJ_FILES = \
-		modules/rdn_name.o
 # End MODULE ldb_rdn_name
 ################################################
 
+ldb_rdn_name_OBJ_FILES = lib/ldb/modules/rdn_name.o
+
 ################################################
 # Start MODULE ldb_map
 [SUBSYSTEM::ldb_map]
 PRIVATE_DEPENDENCIES = LIBTALLOC
 CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_map
-OBJ_FILES = \
-		ldb_map/ldb_map_inbound.o \
-		ldb_map/ldb_map_outbound.o \
-		ldb_map/ldb_map.o
 # End MODULE ldb_map
 ################################################
 
+ldb_map_OBJ_FILES = $(addprefix lib/ldb/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o)
+
 ################################################
 # Start MODULE ldb_skel
 [MODULE::ldb_skel]
@@ -89,38 +87,35 @@ SUBSYSTEM = LIBLDB
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = LDB_MODULE(skel)
-OBJ_FILES = modules/skel.o
 # End MODULE ldb_skel
 ################################################
 
+ldb_skel_OBJ_FILES = lib/ldb/modules/skel.o
+
 ################################################
 # Start MODULE ldb_sqlite3
 [MODULE::ldb_sqlite3]
 SUBSYSTEM = LIBLDB
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC
-OBJ_FILES = \
-		ldb_sqlite3/ldb_sqlite3.o
 # End MODULE ldb_sqlite3
 ################################################
 
+ldb_sqlite3_OBJ_FILES = lib/ldb/ldb_sqlite3/ldb_sqlite3.o
+
 ################################################
 # Start MODULE ldb_tdb
 [MODULE::ldb_tdb]
 SUBSYSTEM = LIBLDB
 CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_tdb
-OBJ_FILES = \
-		ldb_tdb/ldb_tdb.o \
-		ldb_tdb/ldb_search.o \
-		ldb_tdb/ldb_pack.o \
-		ldb_tdb/ldb_index.o \
-		ldb_tdb/ldb_cache.o \
-		ldb_tdb/ldb_tdb_wrap.o
 PRIVATE_DEPENDENCIES = \
 		LIBTDB LIBTALLOC
 # End MODULE ldb_tdb
 ################################################
 
+ldb_tdb_OBJ_FILES = $(addprefix lib/ldb/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pack.o ldb_index.o ldb_cache.o ldb_tdb_wrap.o)
+
+
 ################################################
 # Start SUBSYSTEM ldb
 [LIBRARY::LIBLDB]
@@ -129,20 +124,6 @@ SO_VERSION = 0
 CFLAGS = -Ilib/ldb/include
 PC_FILE = ldb.pc
 INIT_FUNCTION_TYPE = extern const struct ldb_module_ops
-OBJ_FILES = \
-		common/ldb.o \
-		common/ldb_ldif.o \
-		common/ldb_parse.o \
-		common/ldb_msg.o \
-		common/ldb_utf8.o \
-		common/ldb_debug.o \
-		common/ldb_modules.o \
-		common/ldb_match.o \
-		common/ldb_attributes.o \
-		common/attrib_handlers.o \
-		common/ldb_dn.o \
-		common/ldb_controls.o \
-		common/qsort.o
 PUBLIC_DEPENDENCIES = \
 		LIBTALLOC
 PRIVATE_DEPENDENCIES = \
@@ -151,6 +132,8 @@ PRIVATE_DEPENDENCIES = \
 # End SUBSYSTEM ldb
 ################################################
 
+LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o)
+
 PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h
 
 MANPAGES += $(ldbdir)/man/ldb.3
@@ -158,39 +141,38 @@ MANPAGES += $(ldbdir)/man/ldb.3
 ################################################
 # Start BINARY ldbtest
 [BINARY::ldbtest]
-OBJ_FILES= \
-		tools/ldbtest.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbtest
 ################################################
 
+ldbtest_OBJ_FILES = lib/ldb/tools/ldbtest.o
+
 ################################################
 # Start BINARY oLschema2ldif
 [BINARY::oLschema2ldif]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/convert.o \
-		tools/oLschema2ldif.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY oLschema2ldif
 ################################################
 
+
+oLschema2ldif_OBJ_FILES = $(addprefix lib/ldb/tools/, convert.o oLschema2ldif.o)
+
 MANPAGES += $(ldbdir)/man/oLschema2ldif.1
 
 ################################################
 # Start BINARY  ad2oLschema
 [BINARY::ad2oLschema]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/convert.o \
-		tools/ad2oLschema.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ad2oLschema
 ################################################
 
+ad2oLschema_OBJ_FILES = $(addprefix lib/ldb/tools/, convert.o ad2oLschema.o)
+
 MANPAGES += $(ldbdir)/man/ad2oLschema.1
 
 mkinclude tools/config.mk
diff --git a/source4/lib/ldb/ldb_ildap/config.mk b/source4/lib/ldb/ldb_ildap/config.mk
index 3062dc886f..1b534645b6 100644
--- a/source4/lib/ldb/ldb_ildap/config.mk
+++ b/source4/lib/ldb/ldb_ildap/config.mk
@@ -6,9 +6,8 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS
 ALIASES = ldapi ldaps ldap
-OBJ_FILES = \
-		ldb_ildap.o
 # End MODULE ldb_ildap
 ################################################
 
+ldb_ildap_OBJ_FILES = lib/ldb/ldb_ildap/ldb_ildap.o
 
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
index 02ad84ae25..6729636434 100644
--- a/source4/lib/ldb/tools/config.mk
+++ b/source4/lib/ldb/tools/config.mk
@@ -2,89 +2,89 @@
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
 CFLAGS = -Ilib/ldb -Ilib/ldb/include
-OBJ_FILES= \
-		cmdline.o
 PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
 # End SUBSYSTEM LIBLDB_CMDLINE
 ################################################
 
+LIBLDB_CMDLINE_OBJ_FILES = lib/ldb/tools/cmdline.o
+
 ################################################
 # Start BINARY ldbadd
 [BINARY::ldbadd]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-		ldbadd.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE LIBCLI_RESOLVE
 # End BINARY ldbadd
 ################################################
 
+
+ldbadd_OBJ_FILES = lib/ldb/tools/ldbadd.o
+
 MANPAGES += $(ldbdir)/man/ldbadd.1
 
 ################################################
 # Start BINARY ldbdel
 [BINARY::ldbdel]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbdel.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbdel
 ################################################
 
+ldbdel_OBJ_FILES = lib/ldb/tools/ldbdel.o
+
 MANPAGES += $(ldbdir)/man/ldbdel.1
 
 ################################################
 # Start BINARY ldbmodify
 [BINARY::ldbmodify]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbmodify.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbmodify
 ################################################
 
+ldbmodify_OBJ_FILES = lib/ldb/tools/ldbmodify.o
 MANPAGES += $(ldbdir)/man/ldbmodify.1
 
 ################################################
 # Start BINARY ldbsearch
 [BINARY::ldbsearch]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbsearch.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE 
 # End BINARY ldbsearch
 ################################################
 
+ldbsearch_OBJ_FILES = lib/ldb/tools/ldbsearch.o
+
 MANPAGES += $(ldbdir)/man/ldbsearch.1
 
 ################################################
 # Start BINARY ldbedit
 [BINARY::ldbedit]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbedit.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbedit
 ################################################
 
+ldbedit_OBJ_FILES = lib/ldb/tools/ldbedit.o
+
 MANPAGES += $(ldbdir)/man/ldbedit.1
 
 ################################################
 # Start BINARY ldbrename
 [BINARY::ldbrename]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbrename.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbrename
 ################################################
 
+ldbrename_OBJ_FILES = lib/ldb/tools/ldbrename.o
+
 MANPAGES += $(ldbdir)/man/ldbrename.1
 
 
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index 3fec9c0c90..0a0097bdf3 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -2,8 +2,6 @@
 ################################################
 # Start SUBSYSTEM MESSAGING
 [SUBSYSTEM::MESSAGING]
-OBJ_FILES = \
-		messaging.o
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL \
 		TDB_WRAP \
@@ -14,3 +12,6 @@ PUBLIC_DEPENDENCIES = \
 		LIBNDR
 # End SUBSYSTEM MESSAGING
 ################################################
+
+
+MESSAGING_OBJ_FILES = lib/messaging/messaging.o
diff --git a/source4/lib/nss_wrapper/config.mk b/source4/lib/nss_wrapper/config.mk
index 81b0ef36fd..61f6392008 100644
--- a/source4/lib/nss_wrapper/config.mk
+++ b/source4/lib/nss_wrapper/config.mk
@@ -1,8 +1,8 @@
 ##############################
 # Start SUBSYSTEM NSS_WRAPPER
 [SUBSYSTEM::NSS_WRAPPER]
-OBJ_FILES = nss_wrapper.o
 # End SUBSYSTEM NSS_WRAPPER
 ##############################
 
 PUBLIC_HEADERS += lib/nss_wrapper/nss_wrapper.h
+NSS_WRAPPER_OBJ_FILES = lib/nss_wrapper/nss_wrapper.o
diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
index aae98b86b2..d6d229e943 100644
--- a/source4/lib/policy/config.mk
+++ b/source4/lib/policy/config.mk
@@ -1,12 +1,14 @@
 [SUBSYSTEM::LIBPOLICY]
 CFLAGS = -Iheimdal/lib/roken
-OBJ_FILES = lex.o parse_adm.o 
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET 
 
+LIBPOLICY_OBJ_FILES = lib/policy/lex.o lib/policy/parse_adm.o 
+
 lib/policy/lex.l: lib/policy/parse_adm.h
 
 lib/policy/parse_adm.h: lib/policy/parse_adm.c
 
 [BINARY::dumpadm]
-OBJ_FILES = dumpadm.o
 PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
+
+dumpadmin_OBJ_FILES = lib/policy/dumpadm.o
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
index ad218517b3..86d440ac78 100644
--- a/source4/lib/popt/config.mk
+++ b/source4/lib/popt/config.mk
@@ -1,7 +1,5 @@
 [SUBSYSTEM::LIBPOPT]
-OBJ_FILES = findme.o \
-			popt.o \
-			poptconfig.o \
-			popthelp.o \
-			poptparse.o
 CFLAGS = -Ilib/popt
+
+LIBPOPT_OBJ_FILES = $(addprefix lib/popt/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
+
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
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index 2d129c5f8c..d33b38cab0 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -2,7 +2,8 @@
 # Start SUBSYSTEM LIBSAMBA3
 [SUBSYSTEM::SMBPASSWD]
 PRIVATE_PROTO_HEADER = samba3_smbpasswd_proto.h
-OBJ_FILES = smbpasswd.o
 PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL
 # End SUBSYSTEM LIBSAMBA3
 ################################################
+
+SMBPASSWD_OBJ_FILES = lib/samba3/smbpasswd.o
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 5a7a62d8ae..354b1b5198 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -2,44 +2,41 @@
 # Start SUBSYSTEM LIBNETIF
 [SUBSYSTEM::LIBNETIF]
 PRIVATE_PROTO_HEADER = netif_proto.h
-OBJ_FILES = \
-		interface.o \
-		netif.o
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL
 # End SUBSYSTEM LIBNETIF
 ##############################
 
+LIBNETIF_OBJ_FILES = $(addprefix lib/socket/, interface.o netif.o)
+
 ################################################
 # Start MODULE socket_ip
 [MODULE::socket_ip]
 SUBSYSTEM = samba-socket
 OUTPUT_TYPE = MERGED_OBJ
-OBJ_FILES = \
-		socket_ip.o
 PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS 
 # End MODULE socket_ip
 ################################################
 
+socket_ip_OBJ_FILES = lib/socket/socket_ip.o
+
 ################################################
 # Start MODULE socket_unix
 [MODULE::socket_unix]
 SUBSYSTEM = samba-socket
 OUTPUT_TYPE = MERGED_OBJ
-OBJ_FILES = \
-		socket_unix.o
 PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_unix
 ################################################
 
+socket_unix_OBJ_FILES = lib/socket/socket_unix.o
+
 ################################################
 # Start SUBSYSTEM SOCKET
 [SUBSYSTEM::samba-socket]
-OBJ_FILES = \
-		socket.o \
-		access.o \
-		connect_multi.o \
-		connect.o
 PUBLIC_DEPENDENCIES = LIBTALLOC
 PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE
 # End SUBSYSTEM SOCKET
 ################################################
+
+samba-socket_OBJ_FILES = $(addprefix lib/socket/, socket.o access.o connect_multi.o connect.o)
+
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index cc52a99801..99ff5c7bd1 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -1,9 +1,10 @@
 ##############################
 # Start SUBSYSTEM SOCKET_WRAPPER
 [SUBSYSTEM::SOCKET_WRAPPER]
-OBJ_FILES = socket_wrapper.o
 PRIVATE_DEPENDENCIES = EXT_SOCKET
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################
 
 PUBLIC_HEADERS += lib/socket_wrapper/socket_wrapper.h
+
+SOCKET_WRAPPER_OBJ_FILES = lib/socket/socket_wrapper.o
diff --git a/source4/lib/stream/config.mk b/source4/lib/stream/config.mk
index 39e7bc739d..52c8525483 100644
--- a/source4/lib/stream/config.mk
+++ b/source4/lib/stream/config.mk
@@ -1,8 +1,4 @@
-
-################################################
-# Start SUBSYSTEM LIBPACKET
 [SUBSYSTEM::LIBPACKET]
-OBJ_FILES = packet.o
 PRIVATE_DEPENDENCIES = LIBTLS
-# End SUBSYSTEM LIBPACKET
-################################################
+
+LIBPACKET_OBJ_FILES = lib/stream/packet.o
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 33241ffac7..b65cb4ccf6 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,8 +1,8 @@
 [LIBRARY::LIBTALLOC]
 OUTPUT_TYPE = STATIC_LIBRARY
-OBJ_FILES = talloc.o
 CFLAGS = -Ilib/talloc
 
+LIBTALLOC_OBJ_FILES = lib/talloc/talloc.o
 
 MANPAGES += $(tallocdir)/talloc.3
 PUBLIC_HEADERS += $(tallocdir)/talloc.h
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index c69804fa13..fd39074f50 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -2,57 +2,58 @@
 # 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)
+
 PUBLIC_HEADERS += $(tdbdir)/include/tdb.h
 
 ################################################
 # 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/tdr/config.mk b/source4/lib/tdr/config.mk
index eb3cde9bdf..3e05f6c30c 100644
--- a/source4/lib/tdr/config.mk
+++ b/source4/lib/tdr/config.mk
@@ -2,6 +2,7 @@
 CFLAGS = -Ilib/tdr
 PRIVATE_PROTO_HEADER = tdr_proto.h
 PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
-OBJ_FILES = tdr.o
+
+TDR_OBJ_FILES = lib/tdr/tdr.o
 
 PUBLIC_HEADERS += lib/tdr/tdr.h
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index f75c613e73..a92321f59f 100644
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -1,11 +1,7 @@
 ################################################
 # Start SUBSYSTEM LIBTLS
 [SUBSYSTEM::LIBTLS]
-OBJ_FILES = \
-		tls.o \
-		tlscert.o
 PUBLIC_DEPENDENCIES = \
 		LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket
-#
-# End SUBSYSTEM LIBTLS
-################################################
+
+LIBTLS_OBJ_FILES = lib/tls/tls.o lib/tls/tlscert.o
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 16a0357df8..c0c19c2529 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,7 +1,13 @@
 [SUBSYSTEM::LIBSAMBA-UTIL]
 #VERSION = 0.0.1
 #SO_VERSION = 0
-OBJ_FILES = xfile.o \
+PUBLIC_DEPENDENCIES = \
+		LIBTALLOC LIBCRYPTO \
+		SOCKET_WRAPPER EXT_NSL \
+		CHARSET EXECINFO
+
+LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
+	xfile.o \
 		debug.o \
 		fault.o \
 		signal.o \
@@ -18,11 +24,7 @@ OBJ_FILES = xfile.o \
 		ms_fnmatch.o \
 		mutex.o \
 		idtree.o \
-		become_daemon.o
-PUBLIC_DEPENDENCIES = \
-		LIBTALLOC LIBCRYPTO \
-		SOCKET_WRAPPER EXT_NSL \
-		CHARSET EXECINFO
+		become_daemon.o)
 
 PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
 				 attr.h \
@@ -36,33 +38,35 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
 
 [SUBSYSTEM::ASN1_UTIL]
 PRIVATE_PROTO_HEADER = asn1_proto.h
-OBJ_FILES = asn1.o
 
+
+ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
 PUBLIC_HEADERS += lib/util/asn1.h
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h
-OBJ_FILES = unix_privs.o
+
+UNIX_PRIVS_OBJ_FILES = lib/util/unix_privs.o
 
 ################################################
 # Start SUBSYSTEM WRAP_XATTR
 [SUBSYSTEM::WRAP_XATTR]
 PRIVATE_PROTO_HEADER = wrap_xattr.h
-OBJ_FILES = \
-		wrap_xattr.o
 PUBLIC_DEPENDENCIES = XATTR
 #
 # End SUBSYSTEM WRAP_XATTR
 ################################################
 
+WRAP_XATTR_OBJ_FILES = lib/util/wrap_xattr.o
+
 [SUBSYSTEM::UTIL_TDB]
 PRIVATE_PROTO_HEADER = util_tdb.h
-OBJ_FILES = \
-		util_tdb.o
 PUBLIC_DEPENDENCIES = LIBTDB
 
+UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o
+
 [SUBSYSTEM::UTIL_LDB]
 PRIVATE_PROTO_HEADER = util_ldb.h
-OBJ_FILES = \
-			util_ldb.o
 PUBLIC_DEPENDENCIES = LIBLDB
+
+UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o