Use variables for source directory in a couple more places.

diff --git a/source/client/config.mk b/source/client/config.mk
index 5cfa542fbab3a3fde5da644256cece54606d09d6..877544a09af962ed8ad2088c413ba9e8b65469f7 100644 (file)
--- a/source/client/config.mk
+++ b/source/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/source/dsdb/config.mk b/source/dsdb/config.mk
index e621391617609b1c89754a6b66caca58a4f298ac..a22c316a79fa06357aad8c990f4abf887901b0ec 100644 (file)
--- a/source/dsdb/config.mk
+++ b/source/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/source/kdc/config.mk b/source/kdc/config.mk
index 7a96cf6432877d3d159e4c686e456e3fc0be33bc..5f5f39053bf56a911341aac128b07cbea6191072 100644 (file)
--- a/source/kdc/config.mk
+++ b/source/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/source/main.mk b/source/main.mk
index dffe793a5c9964ed2f6b3587217d143102716a4e..dc2347f6fdf83b6a957d007950ef8c3fbc39df20 100644 (file)
--- a/source/main.mk
+++ b/source/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/source/smbd/config.mk b/source/smbd/config.mk
index 006135f818a763f321aa7597b76b5d0fd4147707..b8b87ba435cc5da46d1191b04a70b1c2d470b66f 100644 (file)
--- a/source/smbd/config.mk
+++ b/source/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
 #################################