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)

5 files changed, 25 insertions, 30 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 \