Move object file lists to the Makefile.

(This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6)

5 files changed, 52 insertions, 40 deletions

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 369c5bb4e6..c5a8786b6f 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -5,27 +5,31 @@ mkinclude ntlmssp/config.mk
 mkinclude credentials/config.mk
 
 [SUBSYSTEM::auth_session]
-OBJ_FILES = session.o
 PRIVATE_PROTO_HEADER = session_proto.h
 PUBLIC_DEPENDENCIES = CREDENTIALS
 
 PUBLIC_HEADERS += auth/session.h
 
+auth_session_OBJ_FILES = $(addprefix auth/, session.o)
+
 [SUBSYSTEM::auth_system_session]
-OBJ_FILES = system_session.o
 PRIVATE_PROTO_HEADER = system_session_proto.h
 PUBLIC_DEPENDENCIES = CREDENTIALS
 PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY 
 
+auth_system_session_OBJ_FILES = $(addprefix auth/, system_session.o)
+
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h
-OBJ_FILES = sam.o ntlm_check.o 
 PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
 PRIVATE_DEPENDENCIES = LDAP_ENCODE
 
+auth_sam_OBJ_FILES = $(addprefix auth/, sam.o ntlm_check.o)
+
 [SUBSYSTEM::auth_sam_reply]
 PRIVATE_PROTO_HEADER = auth_sam_reply.h
-OBJ_FILES = auth_sam_reply.o
+
+auth_sam_reply_OBJ_FILES = $(addprefix auth/, auth_sam_reply.o)
 
 #######################
 # Start MODULE auth_sam
@@ -33,49 +37,55 @@ OBJ_FILES = auth_sam_reply.o
 # gensec_krb5 and gensec_gssapi depend on it
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_sam.o
 PRIVATE_DEPENDENCIES = \
 		SAMDB auth_sam
 # End MODULE auth_sam
 #######################
 
+auth_sam_module_OBJ_FILES = $(addprefix auth/, auth_sam.o)
+
 #######################
 # Start MODULE auth_anonymous
 [MODULE::auth_anonymous]
 INIT_FUNCTION = auth_anonymous_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_anonymous.o
 # End MODULE auth_anonymous
 #######################
 
+auth_anonymous_OBJ_FILES = $(addprefix auth/, auth_anonymous.o)
+
 #######################
 # Start MODULE auth_winbind
 [MODULE::auth_winbind]
 INIT_FUNCTION = auth_winbind_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_winbind.o
 PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT
 # End MODULE auth_winbind
 #######################
 
+auth_winbind_OBJ_FILES = $(addprefix auth/, auth_winbind.o)
+
 #######################
 # Start MODULE auth_developer
 [MODULE::auth_developer]
 INIT_FUNCTION = auth_developer_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_developer.o
 # End MODULE auth_developer
 #######################
 
+auth_developer_OBJ_FILES = $(addprefix auth/, auth_developer.o)
+
 [MODULE::auth_unix]
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_unix.o
 PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
 
+auth_unix_OBJ_FILES = $(addprefix auth/, auth_unix.o)
+
 [SUBSYSTEM::PAM_ERRORS]
 PRIVATE_PROTO_HEADER = pam_errors.h
-OBJ_FILES = pam_errors.o
+
+PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
 
 #######################
 # Start SUBSYSTEM auth
@@ -83,15 +93,13 @@ OBJ_FILES = pam_errors.o
 #VERSION = 0.0.1
 #SO_VERSION = 0
 PRIVATE_PROTO_HEADER = auth_proto.h
-OBJ_FILES = \
-		auth.o \
-		auth_util.o \
-		auth_simple.o
 PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM auth
 #######################
 
+auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
+
 PUBLIC_HEADERS += auth/auth.h
 
 [PYTHON::swig_auth]
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index ef8db50109..d01ff73ee9 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -2,16 +2,13 @@
 # Start SUBSYSTEM CREDENTIALS
 [SUBSYSTEM::CREDENTIALS]
 PRIVATE_PROTO_HEADER = credentials_proto.h
-OBJ_FILES = credentials.o \
-		credentials_files.o \
-		credentials_ntlm.o \
-		credentials_krb5.o \
-		../kerberos/kerberos_util.o
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI 
 PRIVATE_DEPENDENCIES = \
 		SECRETS
 
+CREDENTIALS_OBJ_FILES = $(addprefix auth/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
+
 PUBLIC_HEADERS += $(addprefix auth/credentials/, credentials.h credentials_krb5.h)
 
 [PYTHON::swig_credentials]
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index b60f039284..cfa62e1c14 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -5,12 +5,14 @@ PC_FILE = gensec.pc
 VERSION = 0.0.1
 SO_VERSION = 0
 PRIVATE_PROTO_HEADER = gensec_proto.h
-OBJ_FILES = gensec.o socket.o
 PUBLIC_DEPENDENCIES = \
 		CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
 # End SUBSYSTEM gensec
 #################################
 
+
+gensec_OBJ_LIST = $(addprefix auth/, gensec.o socket.o)
+
 PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
 
 ################################################
@@ -18,31 +20,34 @@ PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
 [MODULE::gensec_krb5]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_krb5_init
-OBJ_FILES = gensec_krb5.o 
 PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
+gensec_krb5_OBJ_FILES = $(addprefix auth/, gensec_krb5.o)
+
 ################################################
 # Start MODULE gensec_gssapi
 [MODULE::gensec_gssapi]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_gssapi_init
-OBJ_FILES = gensec_gssapi.o 
 PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS 
 # End MODULE gensec_gssapi
 ################################################
 
+gensec_gssapi_OBJ_FILES = $(addprefix auth/, gensec_gssapi.o)
+
 ################################################
 # Start MODULE cyrus_sasl
 [MODULE::cyrus_sasl]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_sasl_init
-OBJ_FILES = cyrus_sasl.o 
 PRIVATE_DEPENDENCIES = CREDENTIALS SASL 
 # End MODULE cyrus_sasl
 ################################################
 
+cyrus_sasl_OBJ_FILES = $(addprefix auth/gensec/, cyrus_sasl.o)
+
 ################################################
 # Start MODULE gensec_spnego
 [MODULE::gensec_spnego]
@@ -50,31 +55,31 @@ SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_spnego_init
 PRIVATE_PROTO_HEADER = spnego_proto.h
 PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS
-OBJ_FILES = spnego.o spnego_parse.o
 # End MODULE gensec_spnego
 ################################################
 
+gensec_spnego_OBJ_FILES = $(addprefix auth/gensec/, spnego.o spnego_parse.o)
+
 ################################################
 # Start MODULE gensec_schannel
 [MODULE::gensec_schannel]
 SUBSYSTEM = gensec
 PRIVATE_PROTO_HEADER = schannel_proto.h
 INIT_FUNCTION = gensec_schannel_init
-OBJ_FILES = schannel.o \
-			schannel_sign.o
 PRIVATE_DEPENDENCIES = SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR
 OUTPUT_TYPE = MERGED_OBJ
 # End MODULE gensec_schannel
 ################################################
 
+gensec_schannel_OBJ_FILES = $(addprefix auth/gensec/, schannel.o schannel_sign.o)
+
 ################################################
 # Start SUBSYSTEM SCHANNELDB
 [SUBSYSTEM::SCHANNELDB]
 PRIVATE_PROTO_HEADER = schannel_state.h
-OBJ_FILES = \
-		schannel_state.o
 PRIVATE_DEPENDENCIES = LDB_WRAP SAMDB
-#
 # End SUBSYSTEM SCHANNELDB
 ################################################
 
+SCHANNELDB_OBJ_FILES = $(addprefix auth/gensec/, schannel_state.o)
+
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 7493a6d06d..762d6f8c49 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -2,13 +2,16 @@
 # Start SUBSYSTEM KERBEROS
 [SUBSYSTEM::KERBEROS]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = kerberos.o \
-			clikrb5.o \
-			kerberos_heimdal.o \
-			kerberos_pac.o \
-			gssapi_parse.o \
-			krb5_init_context.o
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
 PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR
 # End SUBSYSTEM KERBEROS
 #################################
+
+KERBEROS_OBJ_FILES = $(addprefix auth/kerberos/, \
+	kerberos.o \
+	clikrb5.o \
+	kerberos_heimdal.o \
+	kerberos_pac.o \
+	gssapi_parse.o \
+	krb5_init_context.o)
+
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 9033384b1f..f8e711feda 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -1,6 +1,7 @@
 [SUBSYSTEM::MSRPC_PARSE]
 PRIVATE_PROTO_HEADER = msrpc_parse.h
-OBJ_FILES = ntlmssp_parse.o
+
+MSRPC_PARSE_OBJ_FILES = $(addprefix auth/ntlmssp/, ntlmssp_parse.o)
 
 ################################################
 # Start MODULE gensec_ntlmssp
@@ -8,11 +9,9 @@ OBJ_FILES = ntlmssp_parse.o
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_ntlmssp_init
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = ntlmssp.o \
-		ntlmssp_sign.o \
-		ntlmssp_client.o \
-		ntlmssp_server.o
 PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS
 OUTPUT_TYPE = MERGED_OBJ
 # End MODULE gensec_ntlmssp
 ################################################
+
+gensec_ntlmssp_OBJ_FILES = $(addprefix auth/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o)