Use _OBJ_FILES variables in a couple more places.

(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)

6 files changed, 87 insertions, 109 deletions

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index f786c71469..85fc4ab527 100644
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -2,15 +2,16 @@
 # Start SUBSYSTEM LIBCLI_AUTH
 [SUBSYSTEM::LIBCLI_AUTH]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = credentials.o \
-		session.o \
-		smbencrypt.o \
-		smbdes.o
 PUBLIC_DEPENDENCIES = \
 		MSRPC_PARSE \
 		LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM LIBCLI_AUTH
 #################################
 
+LIBCLI_AUTH_OBJ_FILES = $(addprefix libcli/auth/, \
+		credentials.o \
+		session.o \
+		smbencrypt.o \
+		smbdes.o)
 
 PUBLIC_HEADERS += libcli/auth/credentials.h
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 0c00fa2740..1ed52ca9d3 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -4,120 +4,127 @@ mkinclude security/config.mk
 mkinclude wbclient/config.mk
 
 [SUBSYSTEM::LIBSAMBA-ERRORS]
-OBJ_FILES = util/doserr.o \
-		    util/errormap.o \
-		    util/nterr.o \
 
+LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix libcli/util/, doserr.o errormap.o nterr.o)
 
 PUBLIC_HEADERS += $(addprefix libcli/, util/error.h util/ntstatus.h util/doserr.h util/werror.h)
 
 [SUBSYSTEM::LIBCLI_LSA]
 PRIVATE_PROTO_HEADER = util/clilsa.h
-OBJ_FILES = util/clilsa.o
 PUBLIC_DEPENDENCIES = RPC_NDR_LSA
 PRIVATE_DEPENDENCIES = LIBSECURITY
 
+LIBCLI_LSA_OBJ_FILES = libcli/util/clilsa.o
+
 [SUBSYSTEM::LIBCLI_COMPOSITE]
 PRIVATE_PROTO_HEADER = composite/proto.h
-OBJ_FILES = \
-	composite/composite.o
 PUBLIC_DEPENDENCIES = LIBEVENTS
 
+LIBCLI_COMPOSITE_OBJ_FILES = libcli/composite/composite.o
+
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
 PRIVATE_PROTO_HEADER = smb_composite/proto.h
-OBJ_FILES = \
-	smb_composite/loadfile.o \
-	smb_composite/savefile.o \
-	smb_composite/connect.o \
-	smb_composite/sesssetup.o \
-	smb_composite/fetchfile.o \
-	smb_composite/appendacl.o \
-	smb_composite/fsinfo.o 
 PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE
 
+LIBCLI_SMB_COMPOSITE_OBJ_FILES = $(addprefix libcli/smb_composite/, \
+	loadfile.o \
+	savefile.o \
+	connect.o \
+	sesssetup.o \
+	fetchfile.o \
+	appendacl.o \
+	fsinfo.o)
+
+
 [SUBSYSTEM::NDR_NBT_BUF]
 PRIVATE_PROTO_HEADER = nbt/nbtname.h
-OBJ_FILES = nbt/nbtname.o
+
+NDR_NBT_BUF_OBJ_FILES = libcli/nbt/nbtname.o
 
 [SUBSYSTEM::LIBCLI_NBT]
 #VERSION = 0.0.1
 #SO_VERSION = 0
 PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
-OBJ_FILES = \
-	nbt/nbtsocket.o \
-	nbt/namequery.o \
-	nbt/nameregister.o \
-	nbt/namerefresh.o \
-	nbt/namerelease.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
 	NDR_SECURITY samba-socket LIBSAMBA-UTIL
 
+LIBCLI_NBT_OBJ_FILES = $(addprefix libcli/nbt/, \
+	nbtsocket.o \
+	namequery.o \
+	nameregister.o \
+	namerefresh.o \
+	namerelease.o)
+
 [PYTHON::python_libcli_nbt]
 SWIG_FILE = swig/libcli_nbt.i
 PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
 
+python_libcli_nbt_OBJ_FILES = libcli/swig/libcli_nbt_wrap.o
+
 [PYTHON::python_libcli_smb]
 SWIG_FILE = swig/libcli_smb.i
 PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG
 
+python_libcli_smb_OBJ_FILES = libcli/swig/libcli_smb_wrap.o
+
 [SUBSYSTEM::LIBCLI_DGRAM]
-OBJ_FILES = \
-	dgram/dgramsocket.o \
-	dgram/mailslot.o \
-	dgram/netlogon.o \
-	dgram/ntlogon.o \
-	dgram/browse.o
 PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
 
+LIBCLI_DGRAM_OBJ_FILES = $(addprefix libcli/dgram/, \
+	dgramsocket.o \
+	mailslot.o \
+	netlogon.o \
+	ntlogon.o \
+	browse.o)
+
 [SUBSYSTEM::LIBCLI_CLDAP]
-OBJ_FILES = cldap/cldap.o
 PUBLIC_DEPENDENCIES = LIBCLI_LDAP
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB
 
+LIBCLI_CLDAP_OBJ_FILES = libcli/cldap/cldap.o
 # PUBLIC_HEADERS += libcli/cldap/cldap.h
 
 [SUBSYSTEM::LIBCLI_WREPL]
 PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
-OBJ_FILES = \
-	wrepl/winsrepl.o
 PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS \
 					  LIBPACKET LIBNDR
 
+LIBCLI_WREPL_OBJ_FILES = libcli/wrepl/winsrepl.o
+
 [SUBSYSTEM::LIBCLI_RESOLVE]
 PRIVATE_PROTO_HEADER = resolve/proto.h
-OBJ_FILES = \
-	resolve/resolve.o
 PUBLIC_DEPENDENCIES = NDR_NBT
 
+LIBCLI_RESOLVE_OBJ_FILES = libcli/resolve/resolve.o
+
 [SUBSYSTEM::LP_RESOLVE]
 PRIVATE_PROTO_HEADER = resolve/lp_proto.h
-OBJ_FILES = \
-	resolve/bcast.o \
-	resolve/nbtlist.o \
-	resolve/wins.o \
-	resolve/host.o \
-	resolve/resolve_lp.o
 PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF 
 
+LP_RESOLVE_OBJ_FILES = $(addprefix libcli/resolve/, \
+					  bcast.o nbtlist.o wins.o \
+					  host.o resolve_lp.o)
+
 [SUBSYSTEM::LIBCLI_FINDDCS]
 PRIVATE_PROTO_HEADER = finddcs.h
-OBJ_FILES = \
-	finddcs.o
 PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
 
+LIBCLI_FINDDCS_OBJ_FILES = libcli/finddcs.o
+
 [SUBSYSTEM::LIBCLI_SMB]
 PRIVATE_PROTO_HEADER = libcli_proto.h
-OBJ_FILES = clireadwrite.o \
+PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
+	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
+	LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
+
+LIBCLI_SMB_OBJ_FILES = $(addprefix libcli/, \
+		clireadwrite.o \
 		cliconnect.o \
 		clifile.o \
 		clilist.o \
 		clitrans2.o \
 		climessage.o \
-		clideltree.o
-PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
-	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
-	LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
-
+		clideltree.o)
 
 # PUBLIC_HEADERS += libcli/libcli.h
 
@@ -126,28 +133,11 @@ PRIVATE_PROTO_HEADER = raw/raw_proto.h
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
 #LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
 PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS 
-OBJ_FILES = raw/rawfile.o \
-		raw/smb_signing.o \
-		raw/clisocket.o \
-		raw/clitransport.o \
-		raw/clisession.o \
-		raw/clitree.o \
-		raw/clierror.o \
-		raw/rawrequest.o \
-		raw/rawreadwrite.o \
-		raw/rawsearch.o \
-		raw/rawsetfileinfo.o \
-		raw/raweas.o \
-		raw/rawtrans.o \
-		raw/clioplock.o \
-		raw/rawnegotiate.o \
-		raw/rawfsinfo.o \
-		raw/rawfileinfo.o \
-		raw/rawnotify.o \
-		raw/rawioctl.o \
-		raw/rawacl.o \
-		raw/rawdate.o \
-		raw/rawlpq.o \
-		raw/rawshadow.o
+
+LIBCLI_RAW_OBJ_FILES = $(addprefix libcli/raw/, rawfile.o smb_signing.o clisocket.o \
+					  clitransport.o clisession.o clitree.o clierror.o rawrequest.o \
+					  rawreadwrite.o rawsearch.o rawsetfileinfo.o raweas.o rawtrans.o \
+					  clioplock.o rawnegotiate.o rawfsinfo.o rawfileinfo.o rawnotify.o \
+					  rawioctl.o rawacl.o rawdate.o rawlpq.o rawshadow.o)
 
 mkinclude smb2/config.mk
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 0c5236c138..33e32c7417 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,17 +1,17 @@
 [SUBSYSTEM::LIBCLI_LDAP]
 PRIVATE_PROTO_HEADER = ldap_proto.h
-OBJ_FILES = ldap.o \
-		ldap_client.o \
-		ldap_bind.o \
-		ldap_msg.o \
-		ldap_ildap.o \
-		ldap_controls.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET 
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket NDR_SAMR LIBTLS ASN1_UTIL \
 					   LDAP_ENCODE LIBNDR LP_RESOLVE gensec
 
+LIBCLI_LDAP_OBJ_FILES = $(addprefix libcli/ldap/, \
+					   ldap.o ldap_client.o ldap_bind.o \
+					   ldap_msg.o ldap_ildap.o ldap_controls.o)
+
+
 PUBLIC_HEADERS += libcli/ldap/ldap.h libcli/ldap/ldap_ndr.h
 
 [SUBSYSTEM::LDAP_ENCODE]
-OBJ_FILES = ldap_ndr.o
 # FIXME PRIVATE_DEPENDENCIES = LIBLDB
+
+LDAP_ENCODE_OBJ_FILES = libcli/ldap/ldap_ndr.o
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 8c66df0325..fde065aa34 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,13 +1,14 @@
 [SUBSYSTEM::LIBSECURITY]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = security_token.o \
-		security_descriptor.o \
-		dom_sid.o \
-		access_check.o \
-		privilege.o \
-		sddl.o
 PUBLIC_DEPENDENCIES = NDR_MISC LIBNDR
 
+LIBSECURITY_OBJ_FILES = $(addprefix libcli/security/, \
+					   security_token.o security_descriptor.o \
+					   dom_sid.o access_check.o privilege.o sddl.o)
+
+
 [PYTHON::swig_security]
 SWIG_FILE = security.i
 PRIVATE_DEPENDENCIES = LIBSECURITY
+
+swig_security_OBJ_FILES = libcli/security/security_wrap.o
diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk
index ab079fefde..e95997db54 100644
--- a/source4/libcli/smb2/config.mk
+++ b/source4/libcli/smb2/config.mk
@@ -1,25 +1,10 @@
 [SUBSYSTEM::LIBCLI_SMB2]
 PRIVATE_PROTO_HEADER = smb2_proto.h
-OBJ_FILES = \
-	transport.o \
-	request.o \
-	negprot.o \
-	session.o \
-	tcon.o \
-	create.o \
-	close.o \
-	connect.o \
-	getinfo.o \
-	write.o \
-	read.o \
-	setinfo.o \
-	find.o \
-	ioctl.o \
-	logoff.o \
-	tdis.o \
-	flush.o \
-	lock.o \
-	notify.o \
-	cancel.o \
-	keepalive.o
 PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBPACKET gensec
+
+LIBCLI_SMB2_OBJ_FILES = $(addprefix libcli/smb2/, \
+	transport.o request.o negprot.o session.o tcon.o \
+	create.o close.o connect.o getinfo.o write.o read.o \
+	setinfo.o find.o ioctl.o logoff.o tdis.o flush.o \
+	lock.o notify.o cancel.o keepalive.o)
+
diff --git a/source4/libcli/wbclient/config.mk b/source4/libcli/wbclient/config.mk
index 9384a172ff..94e30d44f1 100644
--- a/source4/libcli/wbclient/config.mk
+++ b/source4/libcli/wbclient/config.mk
@@ -1,4 +1,5 @@
 [SUBSYSTEM::LIBWBCLIENT]
-OBJ_FILES = wbclient.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS
 PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING
+
+LIBWBCLIENT_OBJ_FILES = libcli/wbclient/wbclient.o