r11244: Relative path names in .mk files

(This used to be commit 24e10300906c380919d2d631bfb3b8fd6b3f54ba)

4 files changed, 83 insertions, 79 deletions

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index 0c2e5f9d14..c97bcd1e73 100644
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -1,9 +1,9 @@
 #################################
 # Start SUBSYSTEM LIBCLI_AUTH
 [SUBSYSTEM::LIBCLI_AUTH]
-ADD_OBJ_FILES = libcli/auth/credentials.o \
-		libcli/auth/session.o \
-		libcli/auth/smbencrypt.o 
+ADD_OBJ_FILES = credentials.o \
+		session.o \
+		smbencrypt.o 
 REQUIRED_SUBSYSTEMS = \
 		AUTH SCHANNELDB GENSEC
 # End SUBSYSTEM LIBCLI_AUTH
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 8b39207194..cf9695ec11 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -1,71 +1,75 @@
+include auth/config.mk
+include ldap/config.mk
+include security/config.mk
+
 [SUBSYSTEM::LIBCLI_UTILS]
-ADD_OBJ_FILES = libcli/util/asn1.o \
-		libcli/util/doserr.o \
-		libcli/util/errormap.o \
-		libcli/util/clierror.o \
-		libcli/util/nterr.o \
-		libcli/util/smbdes.o
+ADD_OBJ_FILES = util/asn1.o \
+		util/doserr.o \
+		util/errormap.o \
+		util/clierror.o \
+		util/nterr.o \
+		util/smbdes.o
 
 [SUBSYSTEM::LIBCLI_LSA]
-ADD_OBJ_FILES = libcli/util/clilsa.o
+ADD_OBJ_FILES = util/clilsa.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 
 [SUBSYSTEM::LIBCLI_COMPOSITE]
 ADD_OBJ_FILES = \
-	libcli/composite/composite.o
+	composite/composite.o
 REQUIRED_SUBSYSTEMS = LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
 ADD_OBJ_FILES = \
-	libcli/smb_composite/loadfile.o \
-	libcli/smb_composite/savefile.o \
-	libcli/smb_composite/connect.o \
-	libcli/smb_composite/connect_multi.o \
-	libcli/smb_composite/sesssetup.o \
-	libcli/smb_composite/fetchfile.o \
-	libcli/smb_composite/appendacl.o \
-	libcli/smb_composite/fsinfo.o 
+	smb_composite/loadfile.o \
+	smb_composite/savefile.o \
+	smb_composite/connect.o \
+	smb_composite/connect_multi.o \
+	smb_composite/sesssetup.o \
+	smb_composite/fetchfile.o \
+	smb_composite/appendacl.o \
+	smb_composite/fsinfo.o 
 REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
 
 [SUBSYSTEM::LIBCLI_NBT]
 ADD_OBJ_FILES = \
-	libcli/nbt/nbtname.o \
-	libcli/nbt/nbtsocket.o \
-	libcli/nbt/namequery.o \
-	libcli/nbt/nameregister.o \
-	libcli/nbt/namerefresh.o \
-	libcli/nbt/namerelease.o
+	nbt/nbtname.o \
+	nbt/nbtsocket.o \
+	nbt/namequery.o \
+	nbt/nameregister.o \
+	nbt/namerefresh.o \
+	nbt/namerelease.o
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
 	LIB_SECURITY_NDR
 
 [SUBSYSTEM::LIBCLI_DGRAM]
 ADD_OBJ_FILES = \
-	libcli/dgram/dgramsocket.o \
-	libcli/dgram/mailslot.o \
-	libcli/dgram/netlogon.o \
-	libcli/dgram/ntlogon.o \
-	libcli/dgram/browse.o
+	dgram/dgramsocket.o \
+	dgram/mailslot.o \
+	dgram/netlogon.o \
+	dgram/ntlogon.o \
+	dgram/browse.o
 NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 
 [SUBSYSTEM::LIBCLI_CLDAP]
 ADD_OBJ_FILES = \
-	libcli/cldap/cldap.o
+	cldap/cldap.o
 NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 
 [SUBSYSTEM::LIBCLI_WREPL]
 ADD_OBJ_FILES = \
-	libcli/wrepl/winsrepl.o
+	wrepl/winsrepl.o
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
 ADD_OBJ_FILES = \
-	libcli/resolve/resolve.o \
-	libcli/resolve/nbtlist.o \
-	libcli/resolve/bcast.o \
-	libcli/resolve/wins.o \
-	libcli/resolve/host.o
+	resolve/resolve.o \
+	resolve/nbtlist.o \
+	resolve/bcast.o \
+	resolve/wins.o \
+	resolve/host.o
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 
 [SUBSYSTEM::LIBCLI]
@@ -75,34 +79,34 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBSMB]
 REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
-ADD_OBJ_FILES = libcli/clireadwrite.o \
-		libcli/cliconnect.o \
-		libcli/clifile.o \
-		libcli/clilist.o \
-		libcli/clitrans2.o \
-		libcli/climessage.o \
-		libcli/clideltree.o
+ADD_OBJ_FILES = clireadwrite.o \
+		cliconnect.o \
+		clifile.o \
+		clilist.o \
+		clitrans2.o \
+		climessage.o \
+		clideltree.o
 
 [SUBSYSTEM::LIBCLI_RAW]
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW_KRB5
-OBJ_FILES = libcli/raw/rawfile.o \
-		libcli/raw/smb_signing.o \
-		libcli/raw/clisocket.o \
-		libcli/raw/clitransport.o \
-		libcli/raw/clisession.o \
-		libcli/raw/clitree.o \
-		libcli/raw/rawrequest.o \
-		libcli/raw/rawreadwrite.o \
-		libcli/raw/rawsearch.o \
-		libcli/raw/rawsetfileinfo.o \
-		libcli/raw/raweas.o \
-		libcli/raw/rawtrans.o \
-		libcli/raw/clioplock.o \
-		libcli/raw/rawnegotiate.o \
-		libcli/raw/rawfsinfo.o \
-		libcli/raw/rawfileinfo.o \
-		libcli/raw/rawnotify.o \
-		libcli/raw/rawioctl.o \
-		libcli/raw/rawacl.o \
-		libcli/raw/rawdate.o \
-		libcli/raw/rawlpq.o
+OBJ_FILES = raw/rawfile.o \
+		raw/smb_signing.o \
+		raw/clisocket.o \
+		raw/clitransport.o \
+		raw/clisession.o \
+		raw/clitree.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
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index a92e733493..face7caa66 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,12 +1,12 @@
 #################################
 # Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
-ADD_OBJ_FILES = libcli/ldap/ldap.o \
-		libcli/ldap/ldap_client.o \
-		libcli/ldap/ldap_bind.o \
-		libcli/ldap/ldap_msg.o \
-		libcli/ldap/ldap_ndr.o \
-		libcli/ldap/ldap_ildap.o
+ADD_OBJ_FILES = ldap.o \
+		ldap_client.o \
+		ldap_bind.o \
+		ldap_msg.o \
+		ldap_ndr.o \
+		ldap_ildap.o
 REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET RPC_NDR_SAMR LIBTLS
 # End SUBSYSTEM LIBCLI_LDAP
 #################################
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 40987e37e2..d7492038d3 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
+ADD_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
+ADD_OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
 # End SUBSYSTEM LIB_SECURITY_NDR
@@ -17,12 +17,12 @@ REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
 #################################
 # Start SUBSYSTEM LIB_SECURITY
 [SUBSYSTEM::LIB_SECURITY]
-ADD_OBJ_FILES = libcli/security/security_token.o \
-		libcli/security/security_descriptor.o \
-		libcli/security/dom_sid.o \
-		libcli/security/access_check.o \
-		libcli/security/privilege.o \
-		librpc/ndr/ndr_sec.o
+ADD_OBJ_FILES = security_token.o \
+		security_descriptor.o \
+		dom_sid.o \
+		access_check.o \
+		privilege.o \
+		../../librpc/ndr/ndr_sec.o
 REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR
 # End SUBSYSTEM LIB_SECURITY
 #################################