Use variables for source directory in a couple more places.

(This used to be commit 56bb2907c67d55967f54ce74b029f05067a187c5)

5 files changed, 15 insertions, 12 deletions

diff --git a/source4/client/config.mk b/source4/client/config.mk
index 5cfa542fba..877544a09a 100644
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -18,7 +18,7 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY smbclient
 #################################
 
-smbclient_OBJ_FILES = client/client.o
+smbclient_OBJ_FILES = $(clientsrcdir)/client.o
 
 #################################
 # Start BINARY cifsdd
@@ -33,4 +33,4 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY sdd
 #################################
 
-cifsdd_OBJ_FILES = client/cifsdd.o client/cifsddio.o
+cifsdd_OBJ_FILES = $(addprefix $(clientsrcdir)/, cifsdd.o cifsddio.o)
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index e621391617..a22c316a79 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -12,7 +12,7 @@ PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
 					   SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON
 
 
-SAMDB_OBJ_FILES = $(addprefix dsdb/, \
+SAMDB_OBJ_FILES = $(addprefix $(dsdbsrcdir)/, \
 		samdb/samdb.o \
 		samdb/samdb_privilege.o \
 		samdb/cracknames.o \
@@ -24,7 +24,7 @@ SAMDB_OBJ_FILES = $(addprefix dsdb/, \
 PRIVATE_PROTO_HEADER = common/proto.h
 PRIVATE_DEPENDENCIES = LIBLDB
 
-SAMDB_COMMON_OBJ_FILES = $(addprefix dsdb/common/, \
+SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \
 		sidmap.o \
 		flag_mapping.o \
 		util.o)
@@ -33,7 +33,7 @@ SAMDB_COMMON_OBJ_FILES = $(addprefix dsdb/common/, \
 PRIVATE_PROTO_HEADER = schema/proto.h
 PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
 
-SAMDB_SCHEMA_OBJ_FILES = $(addprefix dsdb/schema/, \
+SAMDB_SCHEMA_OBJ_FILES = $(addprefix $(dsdbsrcdir)/schema/, \
 		schema_init.o \
 		schema_syntax.o \
 		schema_constructed.o)
@@ -52,7 +52,7 @@ PRIVATE_DEPENDENCIES = \
 # End SUBSYSTEM DREPL_SRV
 #######################
 
-DREPL_SRV_OBJ_FILES = $(addprefix dsdb/repl/, \
+DREPL_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/repl/, \
 		drepl_service.o \
 		drepl_periodic.o \
 		drepl_partitions.o \
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 7a96cf6432..5f5f39053b 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -10,7 +10,7 @@ PRIVATE_DEPENDENCIES = \
 # End SUBSYSTEM KDC
 #######################
 
-KDC_OBJ_FILES = $(addprefix kdc/, kdc.o kpasswdd.o)
+KDC_OBJ_FILES = $(addprefix $(kdcsrcdir)/, kdc.o kpasswdd.o)
 
 #######################
 # Start SUBSYSTEM KDC
@@ -23,4 +23,4 @@ PRIVATE_DEPENDENCIES = \
 # End SUBSYSTEM KDC
 #######################
 
-HDB_LDB_OBJ_FILES = $(addprefix kdc/, hdb-ldb.o pac-glue.o)
+HDB_LDB_OBJ_FILES = $(addprefix $(kdcsrcdir)/, hdb-ldb.o pac-glue.o)
diff --git a/source4/main.mk b/source4/main.mk
index dffe793a5c..dc2347f6fd 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -2,7 +2,9 @@ mkinclude dynconfig.mk
 heimdalsrcdir := heimdal
 mkinclude heimdal_build/config.mk
 mkinclude config.mk
+dsdbsrcdir := dsdb
 mkinclude dsdb/config.mk
+smbdsrcdir := smbd
 mkinclude smbd/config.mk
 mkinclude cluster/config.mk
 mkinclude smbd/process_model.mk
@@ -32,4 +34,5 @@ mkinclude libcli/config.mk
 mkinclude scripting/ejs/config.mk
 pyscriptsrcdir := scripting/python
 mkinclude scripting/python/config.mk
+kdcsrcdir := kdc
 mkinclude kdc/config.mk
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 006135f818..b8b87ba435 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -5,7 +5,7 @@ PRIVATE_PROTO_HEADER = service_proto.h
 PRIVATE_DEPENDENCIES = \
 		MESSAGING samba-socket
 
-service_OBJ_FILES = $(addprefix smbd/, \
+service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \
 		service.o \
 		service_stream.o \
 		service_task.o)
@@ -13,7 +13,7 @@ service_OBJ_FILES = $(addprefix smbd/, \
 [SUBSYSTEM::PIDFILE]
 PRIVATE_PROTO_HEADER = pidfile.h
 
-PIDFILE_OBJ_FILES = smbd/pidfile.o
+PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o
 
 #################################
 # Start BINARY smbd
@@ -34,8 +34,8 @@ PRIVATE_DEPENDENCIES = \
 		share \
 		CLUSTER
 
-smbd_OBJ_FILES = smbd/server.o
+smbd_OBJ_FILES = $(smbdsrcdir)/server.o
 
-MANPAGES += smbd/smbd.8
+MANPAGES += $(smbdsrcdir)/smbd.8
 # End BINARY smbd
 #################################