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)

63 files changed, 295 insertions, 339 deletions

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index d572c5e89a..b620cece96 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -9,7 +9,7 @@ include credentials/config.mk
 [MODULE::auth_sam]
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = AUTH
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		auth_sam.o
 REQUIRED_SUBSYSTEMS = \
 		SAMDB
@@ -21,7 +21,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::auth_anonymous]
 INIT_FUNCTION = auth_anonymous_init
 SUBSYSTEM = AUTH
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		auth_anonymous.o
 # End MODULE auth_anonymous
 #######################
@@ -31,7 +31,7 @@ INIT_OBJ_FILES = \
 [MODULE::auth_winbind]
 INIT_FUNCTION = auth_winbind_init
 SUBSYSTEM = AUTH
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		auth_winbind.o
 REQUIRED_SUBSYSTEMS = \
 		LIBWINBIND_CLIENT \
@@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::auth_developer]
 INIT_FUNCTION = auth_developer_init
 SUBSYSTEM = AUTH
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		auth_developer.o
 # End MODULE auth_developer
 #######################
@@ -54,7 +54,7 @@ INIT_OBJ_FILES = \
 [MODULE::auth_unix]
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = AUTH
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		auth_unix.o
 REQUIRED_SUBSYSTEMS = \
 		EXT_LIB_CRYPT EXT_LIB_PAM PAM_ERRORS
@@ -67,9 +67,8 @@ OBJ_FILES = pam_errors.o
 #######################
 # Start SUBSYSTEM AUTH
 [SUBSYSTEM::AUTH]
-INIT_OBJ_FILES = \
-		auth.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		auth.o \
 		auth_util.o \
 		auth_sam_reply.o \
 		ntlm_check.o \
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 00d8319739..4efa81fb04 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -1,8 +1,8 @@
 #################################
 # Start SUBSYSTEM GENSEC
 [SUBSYSTEM::CREDENTIALS]
-INIT_OBJ_FILES = credentials.o
-ADD_OBJ_FILES = credentials_files.o \
+OBJ_FILES = credentials.o \
+		credentials_files.o \
 		credentials_krb5.o \
 		credentials_ntlm.o \
 		credentials_gensec.o 
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 8c51560f86..9078d72647 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -7,7 +7,7 @@ DESCRIPTION = Generic Security Library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = gensec.h
 INIT_FUNCTION = gensec_init
-INIT_OBJ_FILES = gensec.o
+OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \
 		SCHANNELDB
 # End SUBSYSTEM GENSEC
@@ -18,7 +18,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::gensec_krb5]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_krb5_init
-INIT_OBJ_FILES = gensec_krb5.o 
+OBJ_FILES = gensec_krb5.o 
 REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 # End MODULE gensec_krb5
 ################################################
@@ -28,7 +28,7 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 [MODULE::gensec_gssapi]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_gssapi_init
-INIT_OBJ_FILES = gensec_gssapi.o 
+OBJ_FILES = gensec_gssapi.o 
 REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 # End MODULE gensec_gssapi
 ################################################
@@ -38,9 +38,8 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 [MODULE::gensec_spnego]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_spnego_init
-INIT_OBJ_FILES = spnego.o
-ADD_OBJ_FILES = \
-		spnego_parse.o
+OBJ_FILES = spnego.o \
+			spnego_parse.o
 # End MODULE gensec_spnego
 ################################################
 
@@ -49,9 +48,8 @@ ADD_OBJ_FILES = \
 [MODULE::gensec_schannel]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_schannel_init
-INIT_OBJ_FILES = schannel.o
-ADD_OBJ_FILES = \
-		schannel_sign.o
+OBJ_FILES = schannel.o \
+			schannel_sign.o
 REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB
 # End MODULE gensec_schannel
 ################################################
@@ -59,7 +57,7 @@ REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB
 ################################################
 # Start SUBSYSTEM SCHANNELDB
 [SUBSYSTEM::SCHANNELDB]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		schannel_state.o
 #
 # End SUBSYSTEM SCHANNELDB
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index d3b1a6b0dc..53720dd5f6 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -1,14 +1,13 @@
 #################################
 # Start SUBSYSTEM KERBEROS
 [SUBSYSTEM::KERBEROS]
-INIT_OBJ_FILES = kerberos.o 
-ADD_OBJ_FILES = \
-		clikrb5.o \
-		kerberos_verify.o \
-		kerberos_util.o \
-		kerberos_pac.o \
-		gssapi_parse.o \
-		krb5_init_context.o
+OBJ_FILES = kerberos.o \
+			clikrb5.o \
+			kerberos_verify.o \
+			kerberos_util.o \
+			kerberos_pac.o \
+			gssapi_parse.o \
+			krb5_init_context.o
 REQUIRED_SUBSYSTEMS = KERBEROS_LIB NDR_KRB5PAC 
 # End SUBSYSTEM KERBEROS
 #################################
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index b4df62872c..d10c98c838 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -3,8 +3,7 @@
 [MODULE::gensec_ntlmssp]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_ntlmssp_init
-INIT_OBJ_FILES = ntlmssp.o
-ADD_OBJ_FILES = \
+OBJ_FILES = ntlmssp.o \
 		ntlmssp_parse.o \
 		ntlmssp_sign.o \
 		ntlmssp_client.o \
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 89ea0f3853..5ce976f1ab 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -4,7 +4,7 @@ dnl Copyright (C) 2004 Stefan Metzmacher
 dnl Copyright (C) 2004-2005 Jelmer Vernooij
 dnl Published under the GPL
 dnl
-dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
+dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
 dnl
 dnl SMB_EXT_LIB_ENABLE(name,default_build)
 dnl
@@ -18,7 +18,7 @@ dnl #######################################################
 dnl ### And now the implementation			###
 dnl #######################################################
 
-dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
+dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
 	if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then
@@ -29,9 +29,8 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
 @<:@SUBSYSTEM::$1@:>@
-INIT_OBJ_FILES = $2
-ADD_OBJ_FILES = $3
-REQUIRED_SUBSYSTEMS = $4
+OBJ_FILES = $2
+REQUIRED_SUBSYSTEMS = $3
 ENABLE = YES
 # End Subsystem $1
 ###################################
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index f98a3d2bb5..0d9b1bab1d 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -3,12 +3,9 @@
    - get rid of include/structs.h
 - install Samba-specific headers in $INCLUDEDIR/samba-4.0. talloc.h, tdb.h and 
 	ldb.h belong in $INCLUDEDIR
-- init functions may be called more then once as different libraries 
- (in Samba or other projects) can use the same (3rd) library.
 - add register function to smbtorture
 - init functions per shared library / binary
- - add init functions + use lists of function pointers
-  - rpc_ndr
+ - rpc_ndr
  - list not automatically generated
  - utility function for 'init mutex'
 - install shared modules
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 3d55718541..ddc928c8e2 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -21,8 +21,6 @@ my $section_types = {
 		},
 	"SUBSYSTEM" => {
 		"INIT_FUNCTION"		=> "string",
-		"INIT_OBJ_FILES"	=> "list",
-		"ADD_OBJ_FILES"		=> "list",
 		"OBJ_FILES"		=> "list",
 
 		"REQUIRED_SUBSYSTEMS"	=> "list",
@@ -36,8 +34,6 @@ my $section_types = {
 		"SUBSYSTEM"		=> "string",
 
 		"INIT_FUNCTION"		=> "string",
-		"INIT_OBJ_FILES"	=> "list",
-		"ADD_OBJ_FILES"		=> "list",
 		"OBJ_FILES"		=> "list",
 
 		"REQUIRED_SUBSYSTEMS"	=> "list",
@@ -64,8 +60,6 @@ my $section_types = {
 		"RELEASE_VERSION"	=> "string",
 
 		"INIT_FUNCTION"		=> "string",
-		"INIT_OBJ_FILES"	=> "list",
-		"ADD_OBJ_FILES"		=> "list",
 		"OBJ_FILES"		=> "list",
 
 		"DESCRIPTION" => "string",
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
index bd62667b91..77586bcb74 100644
--- a/source4/cldap_server/config.mk
+++ b/source4/cldap_server/config.mk
@@ -3,9 +3,8 @@
 #######################
 # Start SUBSYSTEM CLDAPD
 [SUBSYSTEM::CLDAPD]
-INIT_OBJ_FILES = \
-		cldap_server.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		cldap_server.o \
 		netlogon.o
 REQUIRED_SUBSYSTEMS = \
 		LIBCLI_CLDAP
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 92f3ee30f4..bcdc92d9c0 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -5,9 +5,8 @@ include samdb/ldb_modules/config.mk
 ################################################
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
-INIT_OBJ_FILES = \
-		samdb/samdb.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		samdb/samdb.o \
 		samdb/samdb_privilege.o \
 		samdb/cracknames.o \
 		common/flag_mapping.o
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index 48296dd18b..3d20bff809 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -2,7 +2,7 @@
 # Start MODULE libldb_objectguid
 [MODULE::libldb_objectguid]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		objectguid.o
 REQUIRED_SUBSYSTEMS = \
 		LIBNDR NDR_MISC
@@ -13,7 +13,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE libldb_samldb
 [MODULE::libldb_samldb]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		samldb.o
 #
 # End MODULE libldb_samldb
@@ -23,7 +23,7 @@ INIT_OBJ_FILES = \
 # Start MODULE libldb_samba3sam
 [MODULE::libldb_samba3sam]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		samba3sam.o
 #
 # End MODULE libldb_samldb
@@ -33,7 +33,7 @@ INIT_OBJ_FILES = \
 # Start MODULE libldb_proxy
 [MODULE::libldb_proxy]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		proxy.o
 #
 # End MODULE libldb_proxy
@@ -44,7 +44,7 @@ INIT_OBJ_FILES = \
 # Start MODULE libldb_rootdse
 [MODULE::libldb_rootdse]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		rootdse.o
 #
 # End MODULE libldb_rootdse
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index 5ad1fa7184..5ae5f89832 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -9,8 +9,8 @@ MINOR_VERSION = 0
 RELEASE_VERSION = 1
 NOPROTO = YES
 PUBLIC_HEADERS = common/gtk-smb.h common/select.h
-INIT_OBJ_FILES = common/gtk-smb.o 
-ADD_OBJ_FILES = common/select.o \
+OBJ_FILES = common/gtk-smb.o \
+		common/select.o \
 		common/gtk_events.o \
 		common/credentials.o
 REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index b4b0795cbf..9aab1cf21a 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -1,7 +1,7 @@
 #######################
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/kdc/default_config.o \
 	../heimdal/kdc/kerberos5.o \
 	../heimdal/kdc/pkinit.o \
@@ -18,7 +18,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/hdb/db.o \
 	../heimdal/lib/hdb/hdb.o \
 	../heimdal/lib/hdb/ext.o \
@@ -47,7 +47,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/gssapi/init_sec_context.o \
 	../heimdal/lib/gssapi/inquire_cred.o \
 	../heimdal/lib/gssapi/release_buffer.o \
@@ -94,7 +94,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/krb5/acache.o \
 	../heimdal/lib/krb5/add_et_list.o \
 	../heimdal/lib/krb5/addr_families.o \
@@ -183,7 +183,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_ASN1
 [SUBSYSTEM::HEIMDAL_ASN1]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/asn1/der_get.o \
 	../heimdal/lib/asn1/der_put.o \
 	../heimdal/lib/asn1/der_free.o \
@@ -258,7 +258,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_DES
 [SUBSYSTEM::HEIMDAL_DES]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/des/aes.o \
 	../heimdal/lib/des/des.o \
 	../heimdal/lib/des/md4.o \
@@ -276,19 +276,19 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_GAI_STRERROR]
-ADD_OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
+OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
 NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
-ADD_OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
+OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/roken/getaddrinfo.o \
 	../heimdal/lib/roken/freeaddrinfo.o \
 	../heimdal/lib/roken/getipnodebyaddr.o \
@@ -301,7 +301,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/roken/base64.o \
 	../heimdal/lib/roken/bswap.o \
 	../heimdal/lib/roken/get_window_size.o \
@@ -333,7 +333,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_VERS
 [SUBSYSTEM::HEIMDAL_VERS]
-ADD_OBJ_FILES = ../heimdal/lib/vers/print_version.o
+OBJ_FILES = ../heimdal/lib/vers/print_version.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_VERS
 #######################
@@ -341,14 +341,14 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
-ADD_OBJ_FILES = glue.o
+OBJ_FILES = glue.o
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/com_err/com_err.o \
 	../heimdal/lib/com_err/error.o
 NOPROTO = YES
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index ef14f83893..f1aef75df5 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::KDC]
 NOPROTO = YES
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		kdc.o \
 		pac-glue.o \
 		hdb-ldb.o \
diff --git a/source4/kdc/heimdal_config.mk b/source4/kdc/heimdal_config.mk
index 3e5122363b..0d4ce73e40 100644
--- a/source4/kdc/heimdal_config.mk
+++ b/source4/kdc/heimdal_config.mk
@@ -1,7 +1,7 @@
 #######################
 # Start SUBSYSTEM HEIMDAL
 [LIBRARY::HEIMDAL]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	../heimdal/lib/vers/print_version.o \
 	../heimdal/kdc/default_config.o \
 	../heimdal/kdc/kerberos5.o \
diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 4cbc83d1cf..3bc283e06f 100644
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -3,7 +3,7 @@
 #######################
 # Start SUBSYSTEM LDAP
 [SUBSYSTEM::LDAP]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		ldap_server.o \
 		ldap_backend.o \
 		ldap_bind.o \
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 = \
diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index c97bcd1e73..51d16d8231 100644
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -1,7 +1,7 @@
 #################################
 # Start SUBSYSTEM LIBCLI_AUTH
 [SUBSYSTEM::LIBCLI_AUTH]
-ADD_OBJ_FILES = credentials.o \
+OBJ_FILES = credentials.o \
 		session.o \
 		smbencrypt.o 
 REQUIRED_SUBSYSTEMS = \
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4
index 6e0a88ec35..feb9e79d38 100644
--- a/source4/libcli/config.m4
+++ b/source4/libcli/config.m4
@@ -5,4 +5,4 @@ if test x"$with_ads_support" = x"yes"; then
 	LIBCLI_RAW_LIBS="KRB5"
 fi
 
-SMB_SUBSYSTEM(LIBCLI_RAW_KRB5,[], [], [${LIBCLI_RAW_LIBS}])
+SMB_SUBSYSTEM(LIBCLI_RAW_KRB5, [], [${LIBCLI_RAW_LIBS}])
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 782dac2dd7..f76a396852 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -3,7 +3,7 @@ include ldap/config.mk
 include security/config.mk
 
 [SUBSYSTEM::LIBCLI_UTILS]
-ADD_OBJ_FILES = util/asn1.o \
+OBJ_FILES = util/asn1.o \
 		util/doserr.o \
 		util/errormap.o \
 		util/clierror.o \
@@ -11,16 +11,16 @@ ADD_OBJ_FILES = util/asn1.o \
 		util/smbdes.o
 
 [SUBSYSTEM::LIBCLI_LSA]
-ADD_OBJ_FILES = util/clilsa.o
+OBJ_FILES = util/clilsa.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 
 [SUBSYSTEM::LIBCLI_COMPOSITE]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	composite/composite.o
 REQUIRED_SUBSYSTEMS = LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	smb_composite/loadfile.o \
 	smb_composite/savefile.o \
 	smb_composite/connect.o \
@@ -35,7 +35,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = NetBios over TCP/IP client library
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	nbt/nbtname.o \
 	nbt/nbtsocket.o \
 	nbt/namequery.o \
@@ -46,7 +46,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
 	LIB_SECURITY_NDR
 
 [SUBSYSTEM::LIBCLI_DGRAM]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	dgram/dgramsocket.o \
 	dgram/mailslot.o \
 	dgram/netlogon.o \
@@ -60,7 +60,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = CLDAP client library
-ADD_OBJ_FILES = cldap/cldap.o
+OBJ_FILES = cldap/cldap.o
 PUBLIC_HEADERS = cldap/cldap.h
 NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
@@ -70,12 +70,12 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = WINS Replication client library
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	wrepl/winsrepl.o
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 	resolve/resolve.o \
 	resolve/nbtlist.o \
 	resolve/bcast.o \
@@ -94,7 +94,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBSMB]
 REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
-ADD_OBJ_FILES = clireadwrite.o \
+OBJ_FILES = clireadwrite.o \
 		cliconnect.o \
 		clifile.o \
 		clilist.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index face7caa66..243de79fce 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,7 +1,7 @@
 #################################
 # Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
-ADD_OBJ_FILES = ldap.o \
+OBJ_FILES = ldap.o \
 		ldap_client.o \
 		ldap_bind.o \
 		ldap_msg.o \
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 7faecaf5f2..368a56d2b4 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,14 +1,14 @@
 #################################
 # Start SUBSYSTEM LIB_SECURITY_NDR_HELPER
 [SUBSYSTEM::LIB_SECURITY_NDR_HELPER]
-ADD_OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
+OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
 # End SUBSYSTEM LIB_SECURITY_NDR_HELPER
 #################################
 
 #################################
 # Start SUBSYSTEM LIB_SECURITY_NDR
 [SUBSYSTEM::LIB_SECURITY_NDR]
-ADD_OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
+OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
 # End SUBSYSTEM LIB_SECURITY_NDR
@@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
 #################################
 # Start SUBSYSTEM LIB_SECURITY
 [SUBSYSTEM::LIB_SECURITY]
-ADD_OBJ_FILES = security_token.o \
+OBJ_FILES = security_token.o \
 		security_descriptor.o \
 		dom_sid.o \
 		access_check.o \
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index fe68a8ef59..cf0c64a014 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -8,9 +8,8 @@ DESCRIPTION = User-friendly access to Samba interfaces
 PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
 				 libnet_rpc.h libnet_share.h libnet_time.h libnet_user.h \
 				 libnet_vampire.h userinfo.h userman.h
-INIT_OBJ_FILES = \
-		libnet.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		libnet.o \
 		libnet_passwd.o \
 		libnet_time.o \
 		libnet_rpc.o \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index fafdae0f9c..a6082716b2 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -6,9 +6,8 @@ MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
-INIT_OBJ_FILES = \
-		ndr/ndr.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		ndr/ndr.o \
 		ndr/ndr_basic.o \
 		ndr/ndr_string.o \
 		ndr/ndr_obfuscate.o \
@@ -20,7 +19,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC
 ################################################
 # Start SUBSYSTEM NDR_COMPRESSION
 [SUBSYSTEM::NDR_COMPRESSION]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		ndr/ndr_compression.o
 REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
 # End SUBSYSTEM NDR_COMPRESSION
@@ -30,300 +29,300 @@ include rpc/config.mk
 
 [SUBSYSTEM::NDR_AUDIOSRV]
 INIT_FUNCTION = dcerpc_audiosrv_init
-INIT_OBJ_FILES = gen_ndr/ndr_audiosrv.o
+OBJ_FILES = gen_ndr/ndr_audiosrv.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DCERPC]
 INIT_FUNCTION = dcerpc_dcerpc_init
-INIT_OBJ_FILES = gen_ndr/ndr_dcerpc.o
+OBJ_FILES = gen_ndr/ndr_dcerpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_ECHO]
 INIT_FUNCTION = dcerpc_echo_init
-INIT_OBJ_FILES = gen_ndr/ndr_echo.o
+OBJ_FILES = gen_ndr/ndr_echo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_IRPC]
 INIT_FUNCTION = dcerpc_irpc_init
-INIT_OBJ_FILES = gen_ndr/ndr_irpc.o
+OBJ_FILES = gen_ndr/ndr_irpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_EXCHANGE]
 INIT_FUNCTION = dcerpc_exchange_init
-INIT_OBJ_FILES = gen_ndr/ndr_exchange.o
+OBJ_FILES = gen_ndr/ndr_exchange.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DSBACKUP]
 INIT_FUNCTION = dcerpc_dsbackup_init
-INIT_OBJ_FILES = gen_ndr/ndr_dsbackup.o
+OBJ_FILES = gen_ndr/ndr_dsbackup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_EFS]
 INIT_FUNCTION = dcerpc_efs_init
-INIT_OBJ_FILES = gen_ndr/ndr_efs.o
+OBJ_FILES = gen_ndr/ndr_efs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_MISC]
 INIT_FUNCTION = dcerpc_misc_init
-INIT_OBJ_FILES = gen_ndr/ndr_misc.o
+OBJ_FILES = gen_ndr/ndr_misc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_ROT]
 INIT_FUNCTION = dcerpc_rot_init
-INIT_OBJ_FILES = gen_ndr/ndr_rot.o
+OBJ_FILES = gen_ndr/ndr_rot.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_LSA]
 INIT_FUNCTION = dcerpc_lsa_init
-INIT_OBJ_FILES = gen_ndr/ndr_lsa.o
+OBJ_FILES = gen_ndr/ndr_lsa.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DFS]
 INIT_FUNCTION = dcerpc_dfs_init
-INIT_OBJ_FILES = gen_ndr/ndr_dfs.o
+OBJ_FILES = gen_ndr/ndr_dfs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DRSUAPI]
 INIT_FUNCTION = dcerpc_drsuapi_init
-INIT_OBJ_FILES = gen_ndr/ndr_drsuapi.o
+OBJ_FILES = gen_ndr/ndr_drsuapi.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION
 
 [SUBSYSTEM::NDR_DRSUAPI_PRINT]
-INIT_OBJ_FILES = ndr/ndr_drsuapi.o
+OBJ_FILES = ndr/ndr_drsuapi.o
 
 [SUBSYSTEM::NDR_DRSBLOBS]
 INIT_FUNCTION = dcerpc_drsblobs_init
-INIT_OBJ_FILES = gen_ndr/ndr_drsblobs.o
+OBJ_FILES = gen_ndr/ndr_drsblobs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_POLICYAGENT]
 INIT_FUNCTION = dcerpc_policyagent_init
-INIT_OBJ_FILES = gen_ndr/ndr_policyagent.o
+OBJ_FILES = gen_ndr/ndr_policyagent.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_UNIXINFO]
 INIT_FUNCTION = dcerpc_unixinfo_init
-INIT_OBJ_FILES = gen_ndr/ndr_unixinfo.o
+OBJ_FILES = gen_ndr/ndr_unixinfo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_SAMR]
 INIT_FUNCTION = dcerpc_samr_init
-INIT_OBJ_FILES = gen_ndr/ndr_samr.o
+OBJ_FILES = gen_ndr/ndr_samr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_SPOOLSS]
 INIT_FUNCTION = dcerpc_spoolss_init
-INIT_OBJ_FILES = gen_ndr/ndr_spoolss.o
+OBJ_FILES = gen_ndr/ndr_spoolss.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
 
 [SUBSYSTEM::NDR_SPOOLSS_BUF]
-INIT_OBJ_FILES = ndr/ndr_spoolss_buf.o
+OBJ_FILES = ndr/ndr_spoolss_buf.o
 
 [SUBSYSTEM::NDR_WKSSVC]
 INIT_FUNCTION = dcerpc_wkssvc_init
-INIT_OBJ_FILES = gen_ndr/ndr_wkssvc.o
+OBJ_FILES = gen_ndr/ndr_wkssvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_SRVSVC]
 INIT_FUNCTION = dcerpc_srvsvc_init
-INIT_OBJ_FILES = gen_ndr/ndr_srvsvc.o
+OBJ_FILES = gen_ndr/ndr_srvsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
 
 [SUBSYSTEM::NDR_SVCCTL]
 INIT_FUNCTION = dcerpc_svcctl_init
-INIT_OBJ_FILES = gen_ndr/ndr_svcctl.o
+OBJ_FILES = gen_ndr/ndr_svcctl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_ATSVC]
 INIT_FUNCTION = dcerpc_atsvc_init
-INIT_OBJ_FILES = gen_ndr/ndr_atsvc.o
+OBJ_FILES = gen_ndr/ndr_atsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_EVENTLOG]
 INIT_FUNCTION = dcerpc_eventlog_init
-INIT_OBJ_FILES = gen_ndr/ndr_eventlog.o
+OBJ_FILES = gen_ndr/ndr_eventlog.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_EPMAPPER]
 INIT_FUNCTION = dcerpc_epmapper_init
-INIT_OBJ_FILES = gen_ndr/ndr_epmapper.o
+OBJ_FILES = gen_ndr/ndr_epmapper.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DBGIDL]
 INIT_FUNCTION = dcerpc_dbgidl_init
-INIT_OBJ_FILES = gen_ndr/ndr_dbgidl.o
+OBJ_FILES = gen_ndr/ndr_dbgidl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DSSETUP]
 INIT_FUNCTION = dcerpc_dssetup_init
-INIT_OBJ_FILES = gen_ndr/ndr_dssetup.o
+OBJ_FILES = gen_ndr/ndr_dssetup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_MSGSVC]
 INIT_FUNCTION = dcerpc_msgsvc_init
-INIT_OBJ_FILES = gen_ndr/ndr_msgsvc.o
+OBJ_FILES = gen_ndr/ndr_msgsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_WINS]
 INIT_FUNCTION = dcerpc_wins_init
-INIT_OBJ_FILES = gen_ndr/ndr_wins.o
+OBJ_FILES = gen_ndr/ndr_wins.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_WINREG]
 INIT_FUNCTION = dcerpc_winreg_init
-INIT_OBJ_FILES = gen_ndr/ndr_winreg.o
+OBJ_FILES = gen_ndr/ndr_winreg.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN
 
 [SUBSYSTEM::NDR_INITSHUTDOWN]
 INIT_FUNCTION = dcerpc_initshutdown_init
-INIT_OBJ_FILES = gen_ndr/ndr_initshutdown.o
+OBJ_FILES = gen_ndr/ndr_initshutdown.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_MGMT]
 INIT_FUNCTION = dcerpc_mgmt_init
-INIT_OBJ_FILES = gen_ndr/ndr_mgmt.o
+OBJ_FILES = gen_ndr/ndr_mgmt.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_PROTECTED_STORAGE]
 INIT_FUNCTION = dcerpc_protected_storage_init
-INIT_OBJ_FILES = gen_ndr/ndr_protected_storage.o
+OBJ_FILES = gen_ndr/ndr_protected_storage.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_DCOM]
 INIT_FUNCTION = dcerpc_dcom_init
-INIT_OBJ_FILES = gen_ndr/ndr_dcom.o
+OBJ_FILES = gen_ndr/ndr_dcom.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [SUBSYSTEM::NDR_ORPC_MANUAL]
-INIT_OBJ_FILES = ndr/ndr_orpc.o 
+OBJ_FILES = ndr/ndr_orpc.o 
 
 [SUBSYSTEM::NDR_ORPC]
 INIT_FUNCTION = dcerpc_orpc_init
-INIT_OBJ_FILES = gen_ndr/ndr_orpc.o
+OBJ_FILES = gen_ndr/ndr_orpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
 
 [SUBSYSTEM::NDR_OXIDRESOLVER]
 INIT_FUNCTION = dcerpc_oxidresolver_init
-INIT_OBJ_FILES = gen_ndr/ndr_oxidresolver.o
+OBJ_FILES = gen_ndr/ndr_oxidresolver.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [SUBSYSTEM::NDR_REMACT]
 INIT_FUNCTION = dcerpc_remact_init
-INIT_OBJ_FILES = gen_ndr/ndr_remact.o
+OBJ_FILES = gen_ndr/ndr_remact.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [SUBSYSTEM::NDR_WZCSVC]
 INIT_FUNCTION = dcerpc_wzcsvc_init
-INIT_OBJ_FILES = gen_ndr/ndr_wzcsvc.o
+OBJ_FILES = gen_ndr/ndr_wzcsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_BROWSER]
 INIT_FUNCTION = dcerpc_browser_init
-INIT_OBJ_FILES = gen_ndr/ndr_browser.o
+OBJ_FILES = gen_ndr/ndr_browser.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_W32TIME]
 INIT_FUNCTION = dcerpc_w32time_init
-INIT_OBJ_FILES = gen_ndr/ndr_w32time.o
+OBJ_FILES = gen_ndr/ndr_w32time.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_SCERPC]
 INIT_FUNCTION = dcerpc_scerpc_init
-INIT_OBJ_FILES = gen_ndr/ndr_scerpc.o
+OBJ_FILES = gen_ndr/ndr_scerpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_NTSVCS]
 INIT_FUNCTION = dcerpc_ntsvcs_init
-INIT_OBJ_FILES = gen_ndr/ndr_ntsvcs.o
+OBJ_FILES = gen_ndr/ndr_ntsvcs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_NETLOGON]
 INIT_FUNCTION = dcerpc_netlogon_init
-INIT_OBJ_FILES = gen_ndr/ndr_netlogon.o
+OBJ_FILES = gen_ndr/ndr_netlogon.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR
 
 [SUBSYSTEM::NDR_TRKWKS]
 INIT_FUNCTION = dcerpc_trkwks_init
-INIT_OBJ_FILES = gen_ndr/ndr_trkwks.o
+OBJ_FILES = gen_ndr/ndr_trkwks.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_KEYSVC]
 INIT_FUNCTION = dcerpc_keysvc_init
-INIT_OBJ_FILES = gen_ndr/ndr_keysvc.o
+OBJ_FILES = gen_ndr/ndr_keysvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_KRB5PAC]
 INIT_FUNCTION = dcerpc_krb5pac_init
-INIT_OBJ_FILES = gen_ndr/ndr_krb5pac.o
+OBJ_FILES = gen_ndr/ndr_krb5pac.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL
 
 [SUBSYSTEM::NDR_KRB5PAC_UTIL]
-INIT_OBJ_FILES = ndr/ndr_krb5pac.o
+OBJ_FILES = ndr/ndr_krb5pac.o
 
 [SUBSYSTEM::NDR_XATTR]
 INIT_FUNCTION = dcerpc_xattr_init
-INIT_OBJ_FILES = gen_ndr/ndr_xattr.o
+OBJ_FILES = gen_ndr/ndr_xattr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_SCHANNEL]
 INIT_FUNCTION = dcerpc_schannel_init
-INIT_OBJ_FILES = gen_ndr/ndr_schannel.o
+OBJ_FILES = gen_ndr/ndr_schannel.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [SUBSYSTEM::NDR_NBT]
-INIT_OBJ_FILES = gen_ndr/ndr_nbt.o
+OBJ_FILES = gen_ndr/ndr_nbt.o
 INIT_FUNCTION = dcerpc_nbt_init
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
 
 [SUBSYSTEM::NDR_WINSREPL]
-INIT_OBJ_FILES = gen_ndr/ndr_winsrepl.o
+OBJ_FILES = gen_ndr/ndr_winsrepl.o
 INIT_FUNCTION = dcerpc_winsrepl_init
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
@@ -341,197 +340,197 @@ REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \
 	NDR_INITSHUTDOWN
 
 [SUBSYSTEM::RPC_NDR_ROT]
-ADD_OBJ_FILES = gen_ndr/ndr_rot_c.o
+OBJ_FILES = gen_ndr/ndr_rot_c.o
 REQUIRED_SUBSYSTEMS = NDR_ROT LIBRPC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_AUDIOSRV]
-ADD_OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
+OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
 REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV LIBRPC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_ECHO]
-ADD_OBJ_FILES = gen_ndr/ndr_echo_c.o
+OBJ_FILES = gen_ndr/ndr_echo_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_ECHO
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EXCHANGE]
-ADD_OBJ_FILES = gen_ndr/ndr_exchange_c.o
+OBJ_FILES = gen_ndr/ndr_exchange_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_EXCHANGE
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DSBACKUP]
-ADD_OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
+OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DSBACKUP
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EFS]
-ADD_OBJ_FILES = gen_ndr/ndr_efs_c.o
+OBJ_FILES = gen_ndr/ndr_efs_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_EFS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_LSA]
-ADD_OBJ_FILES = gen_ndr/ndr_lsa_c.o
+OBJ_FILES = gen_ndr/ndr_lsa_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_LSA
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DFS]
-ADD_OBJ_FILES = gen_ndr/ndr_dfs_c.o
+OBJ_FILES = gen_ndr/ndr_dfs_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DFS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DRSUAPI]
-ADD_OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
+OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DRSUAPI
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DRSBLOBS]
-ADD_OBJ_FILES = gen_ndr/ndr_drsblobs_c.o
+OBJ_FILES = gen_ndr/ndr_drsblobs_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DRSBLOBS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_POLICYAGENT]
-ADD_OBJ_FILES = gen_ndr/ndr_policyagent_c.o
+OBJ_FILES = gen_ndr/ndr_policyagent_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_POLICYAGENT
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_UNIXINFO]
-ADD_OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
+OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_UNIXINFO
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SAMR]
-ADD_OBJ_FILES = gen_ndr/ndr_samr_c.o
+OBJ_FILES = gen_ndr/ndr_samr_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_SAMR
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SPOOLSS]
-ADD_OBJ_FILES = gen_ndr/ndr_spoolss_c.o
+OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_SPOOLSS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WKSSVC]
-ADD_OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
+OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_WKSSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SRVSVC]
-ADD_OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
+OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_SRVSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SVCCTL]
-ADD_OBJ_FILES = gen_ndr/ndr_svcctl_c.o
+OBJ_FILES = gen_ndr/ndr_svcctl_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_SVCCTL
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_ATSVC]
-ADD_OBJ_FILES = gen_ndr/ndr_atsvc_c.o
+OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_ATSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EVENTLOG]
-ADD_OBJ_FILES = gen_ndr/ndr_eventlog_c.o
+OBJ_FILES = gen_ndr/ndr_eventlog_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_EVENTLOG
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EPMAPPER]
-ADD_OBJ_FILES = gen_ndr/ndr_epmapper_c.o
+OBJ_FILES = gen_ndr/ndr_epmapper_c.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DBGIDL]
-ADD_OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
+OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DBGIDL
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DSSETUP]
-ADD_OBJ_FILES = gen_ndr/ndr_dssetup_c.o
+OBJ_FILES = gen_ndr/ndr_dssetup_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DSSETUP
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_MSGSVC]
-ADD_OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
+OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_MSGSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WINS]
-ADD_OBJ_FILES = gen_ndr/ndr_wins_c.o
+OBJ_FILES = gen_ndr/ndr_wins_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_WINS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WINREG]
-ADD_OBJ_FILES = gen_ndr/ndr_winreg_c.o
+OBJ_FILES = gen_ndr/ndr_winreg_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_WINREG
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_INITSHUTDOWN]
-ADD_OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
+OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_INITSHUTDOWN
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_MGMT]
-ADD_OBJ_FILES = gen_ndr/ndr_mgmt_c.o
+OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_MGMT
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
-ADD_OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
+OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_PROTECTED_STORAGE
 NOPROTO = YES
 
 [SUBSYSTEM::DCOM_PROXY_DCOM]
-ADD_OBJ_FILES = gen_ndr/ndr_dcom_c.o
+OBJ_FILES = gen_ndr/ndr_dcom_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_DCOM
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_OXIDRESOLVER]
-ADD_OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
+OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_OXIDRESOLVER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_REMACT]
-ADD_OBJ_FILES = gen_ndr/ndr_remact_c.o
+OBJ_FILES = gen_ndr/ndr_remact_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_REMACT
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WZCSVC]
-ADD_OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
+OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_WZCSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_BROWSER]
-ADD_OBJ_FILES = gen_ndr/ndr_browser_c.o
+OBJ_FILES = gen_ndr/ndr_browser_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_BROWSER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_W32TIME]
-ADD_OBJ_FILES = gen_ndr/ndr_w32time_c.o
+OBJ_FILES = gen_ndr/ndr_w32time_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_W32TIME
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SCERPC]
-ADD_OBJ_FILES = gen_ndr/ndr_scerpc_c.o
+OBJ_FILES = gen_ndr/ndr_scerpc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_SCERPC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_NTSVCS]
-ADD_OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
+OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_NTSVCS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_NETLOGON]
-ADD_OBJ_FILES = gen_ndr/ndr_netlogon_c.o
+OBJ_FILES = gen_ndr/ndr_netlogon_c.o
 REQUIRED_SUBSYSTEMS = NDR_NETLOGON
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_TRKWKS]
-ADD_OBJ_FILES = gen_ndr/ndr_trkwks_c.o
+OBJ_FILES = gen_ndr/ndr_trkwks_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_TRKWKS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_KEYSVC]
-ADD_OBJ_FILES = gen_ndr/ndr_keysvc_c.o
+OBJ_FILES = gen_ndr/ndr_keysvc_c.o
 REQUIRED_SUBSYSTEMS = LIBRPC NDR_KEYSVC
 NOPROTO = YES
 
diff --git a/source4/librpc/rpc/config.mk b/source4/librpc/rpc/config.mk
index 98a533cae0..564e6f61e6 100644
--- a/source4/librpc/rpc/config.mk
+++ b/source4/librpc/rpc/config.mk
@@ -1,9 +1,8 @@
 ################################################
 # Start SUBSYSTEM RPC_RAW
 [SUBSYSTEM::RPC_RAW]
-INIT_OBJ_FILES = \
-		dcerpc.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		dcerpc.o \
 		dcerpc_auth.o \
 		dcerpc_schannel.o \
 		dcerpc_util.o \
diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index af5303bca1..24e69eb52e 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -3,7 +3,7 @@
 #######################
 # Start SUBSYSTEM WINSDB
 [SUBSYSTEM::WINSDB]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		wins/winsdb.o
 REQUIRED_SUBSYSTEMS = \
 		LIBLDB
@@ -13,7 +13,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM NBTD_WINS
 [SUBSYSTEM::NBTD_WINS]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		wins/winsserver.o \
 		wins/winsclient.o \
 		wins/winswack.o
@@ -25,7 +25,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM NBTD_DGRAM
 [SUBSYSTEM::NBTD_DGRAM]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		dgram/request.o \
 		dgram/netlogon.o \
 		dgram/ntlogon.o \
@@ -38,9 +38,8 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM NBTD
 [SUBSYSTEM::NBTD]
-INIT_OBJ_FILES = \
-		nbt_server.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		nbt_server.o \
 		interfaces.o \
 		register.o \
 		query.o \
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index cefc704c6e..7b7e5b9a20 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -5,7 +5,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 DESCRIPTION = Client library for communicating with winbind
 RELEASE_VERSION = 1
-ADD_OBJ_FILES = wb_common.o
+OBJ_FILES = wb_common.o
 NOPROTO=YES
 # End SUBSYSTEM LIBWINBIND_CLIENT
 #################################
diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
index 37150211fc..dace20704a 100644
--- a/source4/ntptr/config.mk
+++ b/source4/ntptr/config.mk
@@ -5,7 +5,7 @@
 [MODULE::ntptr_simple_ldb]
 INIT_FUNCTION = ntptr_simple_ldb_init
 SUBSYSTEM = NTPTR
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		simple_ldb/ntptr_simple_ldb.o
 REQUIRED_SUBSYSTEMS = \
 		LIBLDB
@@ -16,9 +16,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM NTPTR
 [SUBSYSTEM::NTPTR]
 INIT_FUNCTION = ntptr_init
-INIT_OBJ_FILES = \
-		ntptr_base.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		ntptr_base.o \
 		ntptr_interface.o
 #
 # End SUBSYSTEM NTPTR
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index a600a9a9a0..1c37a608bf 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -7,7 +7,7 @@ include unixuid/config.mk
 [MODULE::ntvfs_cifs]
 INIT_FUNCTION = ntvfs_cifs_init 
 SUBSYSTEM = NTVFS
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		cifs/vfs_cifs.o
 REQUIRED_SUBSYSTEMS = \
 		LIBCLI
@@ -19,9 +19,8 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::ntvfs_simple]
 INIT_FUNCTION = ntvfs_simple_init 
 SUBSYSTEM = NTVFS
-INIT_OBJ_FILES = \
-		simple/vfs_simple.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		simple/vfs_simple.o \
 		simple/svfs_util.o
 # End MODULE ntvfs_cifs
 ################################################
@@ -31,7 +30,7 @@ ADD_OBJ_FILES = \
 [MODULE::ntvfs_print]
 INIT_FUNCTION = ntvfs_print_init 
 SUBSYSTEM = NTVFS
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		print/vfs_print.o
 # End MODULE ntvfs_print
 ################################################
@@ -41,7 +40,7 @@ INIT_OBJ_FILES = \
 [MODULE::ntvfs_ipc]
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_ipc_init 
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		ipc/vfs_ipc.o \
 		ipc/ipc_rap.o \
 		ipc/rap_server.o
@@ -55,7 +54,7 @@ INIT_OBJ_FILES = \
 [MODULE::ntvfs_nbench]
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_nbench_init 
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		nbench/vfs_nbench.o
 # End MODULE ntvfs_nbench
 ################################################
@@ -63,7 +62,7 @@ INIT_OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM ntvfs_common
 [SUBSYSTEM::ntvfs_common]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		common/brlock.o \
 		common/opendb.o \
 		common/sidmap.o
@@ -80,9 +79,8 @@ MINOR_VERSION = 0
 INIT_FUNCTION = ntvfs_init
 DESCRIPTION = Virtual File System with NTFS semantics
 RELEASE_VERSION = 1
-INIT_OBJ_FILES = \
-		ntvfs_base.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		ntvfs_base.o \
 		ntvfs_generic.o \
 		ntvfs_interface.o \
 		ntvfs_util.o
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index cf406890c9..53c51cf805 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -3,9 +3,8 @@
 [MODULE::ntvfs_posix]
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_posix_init 
-INIT_OBJ_FILES = \
-		vfs_posix.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		vfs_posix.o \
 		pvfs_util.o \
 		pvfs_search.o \
 		pvfs_dirlist.o \
diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
index b9c8000384..d99229729c 100644
--- a/source4/ntvfs/unixuid/config.mk
+++ b/source4/ntvfs/unixuid/config.mk
@@ -3,7 +3,7 @@
 [MODULE::ntvfs_unixuid]
 INIT_FUNCTION = ntvfs_unixuid_init
 SUBSYSTEM = NTVFS
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		vfs_unixuid.o
 REQUIRED_SUBSYSTEMS = \
 		ntvfs_common
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 5948583831..ded7456c20 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -1,6 +1,6 @@
 [SUBSYSTEM::CONFIG]
-INIT_OBJ_FILES = ../dynconfig.o
-ADD_OBJ_FILES = loadparm.o \
+OBJ_FILES = ../dynconfig.o \
+				loadparm.o \
 				params.o \
 				../passdb/secrets.o \
 				generic.o
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 5456acb4cd..f3fccc77fc 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -3,7 +3,7 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		common/server_info.o \
 		common/share_info.o
 #
@@ -16,7 +16,7 @@ ADD_OBJ_FILES = \
 ENABLE = NO
 INIT_FUNCTION = dcerpc_server_dcom_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		dcom/oxidresolver.o \
 		dcom/rot.o \
 		dcom/rodb.o \
@@ -33,7 +33,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_rpcecho]
 INIT_FUNCTION = dcerpc_server_rpcecho_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		echo/rpc_echo.o
 REQUIRED_SUBSYSTEMS = NDR_ECHO
 # End MODULE dcerpc_rpcecho
@@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
 [MODULE::dcerpc_epmapper]
 INIT_FUNCTION = dcerpc_server_epmapper_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		epmapper/rpc_epmapper.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
@@ -55,7 +55,7 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 [MODULE::dcerpc_remote]
 INIT_FUNCTION = dcerpc_server_remote_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		remote/dcesrv_remote.o
 REQUIRED_SUBSYSTEMS = \
 		LIBSMB NDR_ALL
@@ -67,7 +67,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_srvsvc]
 INIT_FUNCTION = dcerpc_server_srvsvc_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		srvsvc/dcesrv_srvsvc.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON NDR_SRVSVC
@@ -79,7 +79,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_wkssvc]
 INIT_FUNCTION = dcerpc_server_wkssvc_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		wkssvc/dcesrv_wkssvc.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON NDR_WKSSVC
@@ -91,7 +91,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_unixinfo]
 INIT_FUNCTION = dcerpc_server_unixinfo_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		unixinfo/dcesrv_unixinfo.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON \
@@ -104,9 +104,8 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_samr]
 INIT_FUNCTION = dcerpc_server_samr_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-		samr/dcesrv_samr.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		samr/dcesrv_samr.o \
 		samr/samr_password.o
 REQUIRED_SUBSYSTEMS = \
 		SAMDB \
@@ -120,7 +119,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_winreg]
 INIT_FUNCTION = dcerpc_server_winreg_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		winreg/rpc_winreg.o
 REQUIRED_SUBSYSTEMS = \
 		REGISTRY NDR_WINREG
@@ -132,7 +131,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_netlogon]
 INIT_FUNCTION = dcerpc_server_netlogon_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		netlogon/dcerpc_netlogon.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON \
@@ -146,7 +145,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_lsarpc]
 INIT_FUNCTION = dcerpc_server_lsarpc_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		lsa/dcesrv_lsa.o
 REQUIRED_SUBSYSTEMS = \
 		SAMDB \
@@ -160,7 +159,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_spoolss]
 INIT_FUNCTION = dcerpc_server_spoolss_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		spoolss/dcesrv_spoolss.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON \
@@ -174,7 +173,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_drsuapi]
 INIT_FUNCTION = dcerpc_server_drsuapi_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		drsuapi/dcesrv_drsuapi.o
 REQUIRED_SUBSYSTEMS = \
 		SAMDB \
@@ -188,7 +187,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_dssetup]
 INIT_FUNCTION = dcerpc_server_dssetup_init
 SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		dssetup/dcesrv_dssetup.o
 REQUIRED_SUBSYSTEMS = \
 		SAMDB \
@@ -200,9 +199,8 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM DCERPC
 [SUBSYSTEM::DCERPC]
-INIT_OBJ_FILES = \
-		dcerpc_server.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		dcerpc_server.o \
 		dcerpc_sock.o \
 		dcesrv_auth.o \
 		handles.o
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index 192692df5b..0810c29998 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -3,9 +3,8 @@
 #######################
 # Start SUBSYSTEM SMB
 [SUBSYSTEM::SMB]
-INIT_OBJ_FILES = \
-		smb_server.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		smb_server.o \
 		tcon.o \
 		session.o \
 		management.o
diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index 4a083ac928..b412674c00 100644
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -1,9 +1,8 @@
 #######################
 # Start SUBSYSTEM SMB_PROTOCOL
 [SUBSYSTEM::SMB_PROTOCOL]
-INIT_OBJ_FILES = \
-		receive.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		receive.o \
 		negprot.o \
 		nttrans.o \
 		reply.o \
diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index 6117c1e43a..4a680200fd 100644
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/smb_server/smb2/config.mk
@@ -1,9 +1,8 @@
 #######################
 # Start SUBSYSTEM SMB2_PROTOCOL
 [SUBSYSTEM::SMB2_PROTOCOL]
-INIT_OBJ_FILES = \
-		receive.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		receive.o \
 		negprot.o \
 		sesssetup.o \
 		tcon.o \
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 7f1ba7dfbb..8c54d79432 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -103,7 +103,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM SERVICE
 [SUBSYSTEM::SERVER_SERVICE]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		service.o \
 		service_stream.o \
 		service_task.o
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index 11df266dc6..7028845475 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -5,7 +5,7 @@
 [MODULE::process_model_single]
 INIT_FUNCTION = process_model_single_init 
 SUBSYSTEM = PROCESS_MODEL
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		process_single.o
 # End MODULE process_model_single
 ################################################
@@ -15,7 +15,7 @@ INIT_OBJ_FILES = \
 [MODULE::process_model_standard]
 INIT_FUNCTION = process_model_standard_init 
 SUBSYSTEM = PROCESS_MODEL
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		process_standard.o
 # End MODULE process_model_standard
 ################################################
@@ -25,7 +25,7 @@ INIT_OBJ_FILES = \
 [MODULE::process_model_thread]
 INIT_FUNCTION = process_model_thread_init 
 SUBSYSTEM = PROCESS_MODEL
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		process_thread.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 # End MODULE process_model_thread
@@ -35,7 +35,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 # Start SUBSYSTEM PROCESS_MODEL
 [SUBSYSTEM::PROCESS_MODEL]
 INIT_FUNCTION = process_model_init
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		process_model.o
 #
 # End SUBSYSTEM PROCESS_MODEL
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 70e41467c7..ec79675f65 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -3,7 +3,7 @@
 #################################
 # Start SUBSYSTEM TORTURE_BASIC
 [SUBSYSTEM::TORTURE_BASIC]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		basic/scanner.o \
 		basic/utable.o \
 		basic/charset.o \
@@ -28,7 +28,7 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_RAW
 [SUBSYSTEM::TORTURE_RAW]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		raw/qfsinfo.o \
 		raw/qfileinfo.o \
 		raw/setfileinfo.o \
@@ -62,7 +62,7 @@ include smb2/config.mk
 #################################
 # Start SUBSYSTEM TORTURE_COM
 [SUBSYSTEM::TORTURE_COM]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		com/simple.o
 REQUIRED_SUBSYSTEMS = \
 		COM DCOM
@@ -72,7 +72,7 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_RPC
 [SUBSYSTEM::TORTURE_RPC]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		rpc/join.o \
 		rpc/lsa.o \
 		rpc/session_key.o \
@@ -122,7 +122,7 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_RAP
 [SUBSYSTEM::TORTURE_RAP]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		rap/rap.o
 REQUIRED_SUBSYSTEMS = \
 		LIBSMB
@@ -132,7 +132,7 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_AUTH
 [SUBSYSTEM::TORTURE_AUTH]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		auth/ntlmssp.o \
 		auth/pac.o
 REQUIRED_SUBSYSTEMS = \
@@ -145,7 +145,7 @@ include local/config.mk
 #################################
 # Start SUBSYSTEM TORTURE_NBENCH
 [SUBSYSTEM::TORTURE_NBENCH]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		nbench/nbio.o \
 		nbench/nbench.o
 # End SUBSYSTEM TORTURE_NBENCH
@@ -154,7 +154,7 @@ ADD_OBJ_FILES = \
 #################################
 # Start SUBSYSTEM TORTURE_LDAP
 [SUBSYSTEM::TORTURE_LDAP]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		ldap/common.o \
 		ldap/basic.o \
 		ldap/cldap.o \
@@ -167,7 +167,7 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_NBT
 [SUBSYSTEM::TORTURE_NBT]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		nbt/query.o \
 		nbt/register.o \
 		nbt/wins.o \
@@ -182,7 +182,7 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_NET
 [SUBSYSTEM::TORTURE_NET]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		libnet/userinfo.o \
 		libnet/userman.o \
 		libnet/domain.o \
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index bbfce62cfd..1d1112b85a 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -1,7 +1,7 @@
 #################################
 # Start SUBSYSTEM TORTURE_LOCAL
 [SUBSYSTEM::TORTURE_LOCAL]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		iconv.o \
 		../../lib/talloc/testsuite.o \
 		messaging.o \
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
index a0a6997fe4..90e57bd6d8 100644
--- a/source4/torture/smb2/config.mk
+++ b/source4/torture/smb2/config.mk
@@ -2,7 +2,7 @@
 #################################
 # Start SUBSYSTEM TORTURE_SMB2
 [SUBSYSTEM::TORTURE_SMB2]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		connect.o \
 		scan.o \
 		util.o \
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index 214ed91778..0f6158e6cc 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -3,9 +3,8 @@
 #######################
 # Start SUBSYSTEM WEB
 [SUBSYSTEM::WEB]
-INIT_OBJ_FILES = \
-		web_server.o
-ADD_OBJ_FILES = \
+OBJ_FILES = \
+		web_server.o \
 		http.o
 REQUIRED_SUBSYSTEMS = ESP LIBTLS SMBCALLS
 # End SUBSYSTEM WEB
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index d3610550ae..e3ed9a057b 100644
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -3,7 +3,7 @@
 #######################
 # Start SUBSYSTEM WINBIND
 [SUBSYSTEM::WINBIND]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		wb_server.o \
 		wb_samba3_protocol.o \
 		wb_samba3_cmd.o \
@@ -27,7 +27,7 @@ REQUIRED_SUBSYSTEMS = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR
 ################################################
 # Start SUBYSTEM WB_HELPER
 [SUBSYSTEM::WB_HELPER]
-ADD_OBJ_FILES = \
+OBJ_FILES = \
 		wb_async_helpers.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA RPC_NDR_SAMR
 # End SUBSYSTEM WB_HELPER
diff --git a/source4/wrepl_server/config.mk b/source4/wrepl_server/config.mk
index 74335cbf05..6dd0e2a305 100644
--- a/source4/wrepl_server/config.mk
+++ b/source4/wrepl_server/config.mk
@@ -3,7 +3,7 @@
 #######################
 # Start SUBSYSTEM WREPL_SRV
 [SUBSYSTEM::WREPL_SRV]
-INIT_OBJ_FILES = \
+OBJ_FILES = \
 		wrepl_server.o \
 		wrepl_in_connection.o \
 		wrepl_in_call.o \