r12498: Eliminate INIT_OBJ_FILES and ADD_OBJ_FILES. We were not using

the difference between these at all, and in the future the
fact that INIT_OBJ_FILES include smb_build.h will be sufficient to
have recompiles at the right time.
(This used to be commit b24f2583edee38abafa58578d8b5c4b43e517def)

20 files changed, 55 insertions, 68 deletions

diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk
index 593404c87b..4035840d47 100644
--- a/source4/lib/appweb/config.mk
+++ b/source4/lib/appweb/config.mk
@@ -1,7 +1,7 @@
 #######################
 # Start SUBSYSTEM MPR
 [SUBSYSTEM::MPR]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		mpr/miniMpr.o \
 		mpr/var.o
 NOPROTO=YES
@@ -12,7 +12,7 @@ NOPROTO=YES
 #######################
 # Start SUBSYSTEM EJS
 [SUBSYSTEM::EJS]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		ejs/ejsLib.o  \
 		ejs/ejsLex.o \
 		ejs/ejsParser.o \
@@ -25,7 +25,7 @@ NOPROTO=YES
 #######################
 # Start SUBSYSTEM ESP
 [SUBSYSTEM::ESP]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		esp/esp.o  \
 		esp/espProcs.o
 REQUIRED_SUBSYSTEMS = EJS
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 486f8d8a1e..4d2d1b08fd 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -20,9 +20,8 @@ include stream/config.mk
 ##############################
 # Start SUBSYSTEM LIBNETIF
 [SUBSYSTEM::LIBNETIF]
-INIT_OBJ_FILES = \
-		netif/interface.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		netif/interface.o \
 		netif/netif.o
 # End SUBSYSTEM LIBNETIF
 ##############################
@@ -33,15 +32,14 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Simple marshall/unmarshall library
-INIT_OBJ_FILES = tdr/tdr.o
+OBJ_FILES = tdr/tdr.o
 
 ##############################
 # Start SUBSYSTEM LIBCRYPTO
 [SUBSYSTEM::LIBCRYPTO]
 NOPROTO = YES
-INIT_OBJ_FILES = \
-		crypto/crc32.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		crypto/crc32.o \
 		crypto/md5.o \
 		crypto/hmacmd5.o \
 		crypto/md4.o \
@@ -52,7 +50,7 @@ ADD_OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBCOMPRESSION
 [SUBSYSTEM::LIBCOMPRESSION]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		compression/mszip.o
 # End SUBSYSTEM LIBCOMPRESION
 ################################################
@@ -64,8 +62,7 @@ OBJ_FILES = \
 ##############################
 # Start SUBSYSTEM LIBBASIC
 [SUBSYSTEM::LIBBASIC]
-INIT_OBJ_FILES = version.o
-ADD_OBJ_FILES = \
+OBJ_FILES = version.o \
 		xfile.o \
 		debug.o \
 		fault.o \
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index b61f9e7ea2..4fb8ee79bf 100644
--- a/source4/lib/charset/config.mk
+++ b/source4/lib/charset/config.mk
@@ -1,9 +1,8 @@
 ################################################
 # Start SUBSYSTEM CHARSET
 [SUBSYSTEM::CHARSET]
-INIT_OBJ_FILES = \
-		iconv.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		iconv.o \
 		charcnv.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
 # End SUBSYSTEM CHARSET
diff --git a/source4/lib/cmdline/config.m4 b/source4/lib/cmdline/config.m4
index e43f7cf390..dd956642cd 100644
--- a/source4/lib/cmdline/config.m4
+++ b/source4/lib/cmdline/config.m4
@@ -74,7 +74,7 @@ TMP_LIBCMDLINE_LIBS="$TERMLIBS"
 
 SMB_EXT_LIB(READLINE, [${TMP_LIBCMDLINE_LIBS}])
 
-SMB_SUBSYSTEM(LIBCMDLINE,[],
+SMB_SUBSYSTEM(LIBCMDLINE,
 		[${TMP_LIBCMDLINE_OBJS}],
 		[LIBPOPT EXT_LIB_READLINE LIBCMDLINE_CREDENTIALS])
 
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index badb2f6dcf..36f8ba7469 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,7 +1,7 @@
 ##############################
 # Start SUBSYSTEM LIBCMDLINE_CREDENTIALS
 [SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
-ADD_OBJ_FILES = getsmbpass.o \
+OBJ_FILES = getsmbpass.o \
 		credentials.o
 REQUIRED_SUBSYSTEMS = CREDENTIALS
 # End SUBSYSTEM LIBCMDLINE_CREDENTIALS
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
index 77e3724924..9e66502046 100644
--- a/source4/lib/com/config.mk
+++ b/source4/lib/com/config.mk
@@ -1,12 +1,12 @@
 [SUBSYSTEM::COM]
 INIT_FUNCTION = com_init
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		tables.o \
 		rot.o \
 		main.o
 
 [SUBSYSTEM::DCOM]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		dcom/main.o \
 		dcom/tables.o
 REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
@@ -14,5 +14,5 @@ REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
 
 [MODULE::com_simple]
 SUBSYSTEM = COM
-INIT_OBJ_FILES = classes/simple.o
+OBJ_FILES = classes/simple.o
 INIT_FUNCTION = com_simple_init
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 60d01b5568..16ee74c29e 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -2,8 +2,7 @@
 # Start SUBSYSTEM LIBEVENTS
 [SUBSYSTEM::LIBEVENTS]
 NOPROTO = YES
-INIT_OBJ_FILES = events.o
-ADD_OBJ_FILES = events_standard.o
+OBJ_FILES = events.o events_standard.o
 REQUIRED_SUBSYSTEMS = LIBTALLOC
 # End SUBSYSTEM LIBEVENTS
 ##############################
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index a47fd59577..2ae23c0fd4 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -2,7 +2,7 @@
 # Start MODULE libldb_operational
 [MODULE::libldb_operational]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		modules/operational.o
 # End MODULE libldb_operational
 ################################################
@@ -11,7 +11,7 @@ INIT_OBJ_FILES = \
 # Start MODULE libldb_rdn_name
 [MODULE::libldb_rdn_name]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		modules/rdn_name.o
 # End MODULE libldb_rdn_name
 ################################################
@@ -20,7 +20,7 @@ INIT_OBJ_FILES = \
 # Start MODULE libldb_schema
 [MODULE::libldb_schema]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		modules/schema.o
 # End MODULE libldb_schema
 ################################################
@@ -29,7 +29,7 @@ INIT_OBJ_FILES = \
 # Start MODULE libldb_ildap
 [MODULE::libldb_ildap]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		ldb_ildap/ldb_ildap.o
 REQUIRED_SUBSYSTEMS = \
 		LIBCLI_LDAP
@@ -41,7 +41,7 @@ NOPROTO = YES
 # Start MODULE libldb_map
 [MODULE::libldb_map]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = modules/ldb_map.o
+OBJ_FILES = modules/ldb_map.o
 # End MODULE libldb_map
 ################################################
 
@@ -49,7 +49,7 @@ INIT_OBJ_FILES = modules/ldb_map.o
 # Start MODULE libldb_sqlite3
 [MODULE::libldb_sqlite3]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		ldb_sqlite3/ldb_sqlite3.o
 REQUIRED_SUBSYSTEMS = \
 		EXT_LIB_SQLITE3
@@ -61,9 +61,8 @@ NOPROTO = YES
 # Start MODULE libldb_tdb
 [MODULE::libldb_tdb]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
-		ldb_tdb/ldb_tdb.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		ldb_tdb/ldb_tdb.o \
 		ldb_tdb/ldb_search.o \
 		ldb_tdb/ldb_pack.o \
 		ldb_tdb/ldb_index.o \
@@ -82,9 +81,8 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 DESCRIPTION = LDAP-like embedded database library
 RELEASE_VERSION = 1
-INIT_OBJ_FILES = \
-		common/ldb.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		common/ldb.o \
 		common/ldb_ldif.o \
 		common/ldb_parse.o \
 		common/ldb_msg.o \
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index 7643ec09ed..5e53b49903 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -2,10 +2,8 @@
 ################################################
 # Start SUBSYSTEM MESSAGING
 [SUBSYSTEM::MESSAGING]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		messaging.o
-# \
-#		msgutil.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = \
 		NDR_IRPC \
diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4
index 227c9a1237..0eca06ceed 100644
--- a/source4/lib/popt/config.m4
+++ b/source4/lib/popt/config.m4
@@ -26,12 +26,12 @@ fi
 AC_MSG_CHECKING(whether to use included popt)
 if test x"$INCLUDED_POPT" != x"no"; then
 	CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt"
-	SMB_SUBSYSTEM(LIBPOPT,[],
+	SMB_SUBSYSTEM(LIBPOPT,
 		[],
 		[INT_LIB_POPT])
 	AC_MSG_RESULT(yes)
 else
-	SMB_SUBSYSTEM(LIBPOPT,[],
+	SMB_SUBSYSTEM(LIBPOPT,
 		[],
 		[EXT_LIB_POPT])
 	SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}])
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
index 9140716b47..f65831bbed 100644
--- a/source4/lib/popt/config.mk
+++ b/source4/lib/popt/config.mk
@@ -1,7 +1,7 @@
 ##############################
 # Start SUBSYSTEM INT_LIB_POPT
 [SUBSYSTEM::INT_LIB_POPT]
-ADD_OBJ_FILES = findme.o \
+OBJ_FILES = findme.o \
 				popt.o \
 				poptconfig.o \
 				popthelp.o \
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 768697e2a1..f3e7abec3a 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -5,7 +5,7 @@
 [MODULE::registry_nt4]
 INIT_FUNCTION = registry_nt4_init
 SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		reg_backend_nt4.o
 REQUIRED_SUBSYSTEMS = TDR_REGF
 # End MODULE registry_nt4
@@ -14,7 +14,7 @@ REQUIRED_SUBSYSTEMS = TDR_REGF
 [SUBSYSTEM::TDR_REGF]
 REQUIRED_SUBSYSTEMS = TDR 
 NOPROTO = YES
-INIT_OBJ_FILES = tdr_regf.o
+OBJ_FILES = tdr_regf.o
 
 lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
 lib/registry/tdr_regf.c: lib/registry/regf.idl
@@ -25,7 +25,7 @@ lib/registry/tdr_regf.c: lib/registry/regf.idl
 [MODULE::registry_w95]
 INIT_FUNCTION = registry_w95_init
 SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		reg_backend_w95.o
 # End MODULE registry_w95
 ################################################
@@ -35,7 +35,7 @@ INIT_OBJ_FILES = \
 [MODULE::registry_dir]
 INIT_FUNCTION = registry_dir_init
 SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		reg_backend_dir.o
 # End MODULE registry_dir
 ################################################
@@ -45,7 +45,7 @@ INIT_OBJ_FILES = \
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
 SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		reg_backend_rpc.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
 # End MODULE registry_rpc
@@ -58,7 +58,7 @@ REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
 [MODULE::registry_gconf]
 INIT_FUNCTION = registry_gconf_init
 SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		reg_backend_gconf.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
 # End MODULE registry_gconf
@@ -69,7 +69,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
 [MODULE::registry_ldb]
 INIT_FUNCTION = registry_ldb_init
 SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		reg_backend_ldb.o
 REQUIRED_SUBSYSTEMS = \
 		LIBLDB
@@ -84,9 +84,8 @@ MINOR_VERSION = 0
 INIT_FUNCTION = registry_init
 DESCRIPTION = Windows-style registry library
 RELEASE_VERSION = 1
-INIT_OBJ_FILES = \
-		common/reg_interface.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		common/reg_interface.o \
 		common/reg_util.o \
 		reg_samba.o \
 		patchfile.o
diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
index 49133651b4..7ed33b2dc0 100644
--- a/source4/lib/replace/config.mk
+++ b/source4/lib/replace/config.mk
@@ -1,7 +1,7 @@
 ##############################
 # Start SUBSYSTEM REPLACE_READDIR
 [SUBSYSTEM::REPLACE_READDIR]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		repdir/repdir.o
 NOPROTO = YES
 # End SUBSYSTEM REPLACE_READDIR
@@ -11,8 +11,7 @@ NOPROTO = YES
 ##############################
 # Start SUBSYSTEM LIBREPLACE
 [SUBSYSTEM::LIBREPLACE]
-INIT_OBJ_FILES = replace.o
-ADD_OBJ_FILES = \
+OBJ_FILES = replace.o \
 		snprintf.o \
 		dlfcn.o
 NOPROTO = YES
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index ff6771a244..76d3f50e4b 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -6,7 +6,7 @@ MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Library for reading Samba3 data files
 PUBLIC_HEADERS = samba3.h
-ADD_OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
+OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
 		idmap.o winsdb.o samba3.o group.o \
 		registry.o secrets.o share_info.o
 # End SUBSYSTEM LIBSAMBA3
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 64b542b7bc..81741aece7 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -3,7 +3,7 @@
 # Start MODULE socket_ipv4
 [MODULE::socket_ipv4]
 SUBSYSTEM = SOCKET
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		socket_ipv4.o
 NOPROTO=YES
 # End MODULE socket_ipv4
@@ -13,7 +13,7 @@ NOPROTO=YES
 # Start MODULE socket_ipv6
 [MODULE::socket_ipv6]
 SUBSYSTEM = SOCKET
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		socket_ipv6.o
 NOPROTO=YES
 # End MODULE socket_ipv6
@@ -23,7 +23,7 @@ NOPROTO=YES
 # Start MODULE socket_unix
 [MODULE::socket_unix]
 SUBSYSTEM = SOCKET
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		socket_unix.o
 NOPROTO=YES
 # End MODULE socket_unix
@@ -32,9 +32,8 @@ NOPROTO=YES
 ################################################
 # Start SUBSYSTEM SOCKET
 [SUBSYSTEM::SOCKET]
-INIT_OBJ_FILES = \
-		socket.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		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 92a97e557e..38eabee6b3 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -7,6 +7,6 @@ RELEASE_VERSION = 1
 NOPROTO = YES
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
-INIT_OBJ_FILES = socket_wrapper.o
+OBJ_FILES = socket_wrapper.o
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################
diff --git a/source4/lib/stream/config.mk b/source4/lib/stream/config.mk
index 1ec650ab10..923447e4d2 100644
--- a/source4/lib/stream/config.mk
+++ b/source4/lib/stream/config.mk
@@ -2,7 +2,7 @@
 ################################################
 # Start SUBSYSTEM LIBPACKET
 [SUBSYSTEM::LIBPACKET]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		packet.o
 NOPROTO=YES
 # End SUBSYSTEM LIBPACKET
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 81a8833a94..70be4d0f4f 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -4,7 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
-INIT_OBJ_FILES = talloc.o
+OBJ_FILES = talloc.o
 REQUIRED_SUBSYSTEMS = LIBREPLACE
 NOPROTO = YES
 MANPAGE = talloc.3
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 69483aad92..76e0eade85 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -5,9 +5,8 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Trivial Database Library
-INIT_OBJ_FILES = \
-		common/tdb.o
-ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \
+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
 NOPROTO=YES
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index 29d458acac..ea1bd5be55 100644
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -1,7 +1,7 @@
 ################################################
 # Start SUBSYSTEM LIBTLS
 [SUBSYSTEM::LIBTLS]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		tls.o \
 		tlscert.o
 REQUIRED_SUBSYSTEMS = \