diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index e7e0ba80c4c..110f8fe08b4 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -1,23 +1,3 @@
-# LIB BASIC subsystem
-mkinclude samba3/config.mk
-mkinclude socket/config.mk
-mkinclude charset/config.mk
-mkinclude ldb-samba/config.mk
-mkinclude tls/config.mk
-mkinclude registry/config.mk
-mkinclude messaging/config.mk
-mkinclude events/config.mk
-mkinclude cmdline/config.mk
-mkinclude socket_wrapper/config.mk
-mkinclude nss_wrapper/config.mk
-mkinclude appweb/config.mk
-mkinclude stream/config.mk
-mkinclude util/config.mk
-mkinclude tdr/config.mk
-mkinclude dbwrap/config.mk
-mkinclude crypto/config.mk
-mkinclude torture/config.mk
-
 [SUBSYSTEM::LIBCOMPRESSION]
 
 LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
diff --git a/source/main.mk b/source/main.mk
index 5f0f0cb8153..e3d4aa14175 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -15,6 +15,24 @@ authsrcdir := auth
 mkinclude auth/config.mk
 nsswitchsrcdir = nsswitch
 mkinclude nsswitch/config.mk
+mkinclude lib/samba3/config.mk
+mkinclude lib/socket/config.mk
+mkinclude lib/charset/config.mk
+mkinclude lib/ldb-samba/config.mk
+mkinclude lib/tls/config.mk
+mkinclude lib/registry/config.mk
+mkinclude lib/messaging/config.mk
+mkinclude lib/events/config.mk
+mkinclude lib/cmdline/config.mk
+mkinclude lib/socket_wrapper/config.mk
+mkinclude lib/nss_wrapper/config.mk
+mkinclude lib/appweb/config.mk
+mkinclude lib/stream/config.mk
+mkinclude lib/util/config.mk
+mkinclude lib/tdr/config.mk
+mkinclude lib/dbwrap/config.mk
+mkinclude lib/crypto/config.mk
+mkinclude lib/torture/config.mk
 mkinclude lib/basic.mk
 paramsrcdir := param
 mkinclude param/config.mk
@@ -49,6 +67,7 @@ clientsrcdir := client
 mkinclude client/config.mk
 libclisrcdir := libcli
 mkinclude libcli/config.mk
+ejsscriptsrcdir := scripting/ejs
 mkinclude scripting/ejs/config.mk
 pyscriptsrcdir := scripting/python
 mkinclude scripting/python/config.mk
diff --git a/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk
index 896b292e23d..f4af4ba8115 100644
--- a/source/scripting/ejs/config.mk
+++ b/source/scripting/ejs/config.mk
@@ -1,13 +1,13 @@
 [SUBSYSTEM::EJSRPC]
 
-EJSRPC_OBJ_FILES = scripting/ejs/ejsrpc.o
+EJSRPC_OBJ_FILES = $(ejsscriptsrcdir)/ejsrpc.o
 
 [MODULE::smbcalls_config]
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
-smbcalls_config_OBJ_FILES = scripting/ejs/smbcalls_config.o
+smbcalls_config_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_config.o
 
 [MODULE::smbcalls_ldb]
 OUTPUT_TYPE = MERGED_OBJ
@@ -15,7 +15,7 @@ SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
-smbcalls_ldb_OBJ_FILES = scripting/ejs/smbcalls_ldb.o
+smbcalls_ldb_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_ldb.o
 
 [MODULE::smbcalls_reg]
 SUBSYSTEM = smbcalls
@@ -23,21 +23,21 @@ OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
-smbcalls_reg_OBJ_FILES = scripting/ejs/smbcalls_reg.o
+smbcalls_reg_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_reg.o
 
 [MODULE::smbcalls_nbt]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nbt
 
-smbcalls_nbt_OBJ_FILES = scripting/ejs/smbcalls_nbt.o
+smbcalls_nbt_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_nbt.o
 
 [MODULE::smbcalls_rand]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_random
 
-smbcalls_rand_OBJ_FILES = scripting/ejs/smbcalls_rand.o
+smbcalls_rand_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_rand.o
 
 [MODULE::smbcalls_nss]
 SUBSYSTEM = smbcalls
@@ -45,14 +45,14 @@ OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
-smbcalls_nss_OBJ_FILES = scripting/ejs/smbcalls_nss.o
+smbcalls_nss_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_nss.o
 
 [MODULE::smbcalls_data]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_datablob
 
-smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
+smbcalls_data_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_data.o
 
 [MODULE::smbcalls_auth]
 OUTPUT_TYPE = MERGED_OBJ
@@ -60,23 +60,23 @@ SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PRIVATE_DEPENDENCIES = service_auth
 
-smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
+smbcalls_auth_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_auth.o
 
-smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
+smbcalls_auth_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_auth.o
 
 [MODULE::smbcalls_string]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_string
 
-smbcalls_string_OBJ_FILES = scripting/ejs/smbcalls_string.o
+smbcalls_string_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_string.o
 
 [MODULE::smbcalls_sys]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_system
 
-smbcalls_sys_OBJ_FILES = scripting/ejs/smbcalls_sys.o
+smbcalls_sys_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_sys.o
 
 mkinclude ejsnet/config.mk
 
@@ -90,7 +90,7 @@ PRIVATE_DEPENDENCIES = \
 		dcerpc \
 		NDR_TABLE
 
-smbcalls_OBJ_FILES = $(addprefix scripting/ejs/, \
+smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_cli.o \
 		smbcalls_rpc.o \
@@ -107,4 +107,4 @@ PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
 # End BINARY SMBSCRIPT
 #######################
 
-smbscript_OBJ_FILES = scripting/ejs/smbscript.o
+smbscript_OBJ_FILES = $(ejsscriptsrcdir)/smbscript.o
diff --git a/source/scripting/ejs/ejsnet/config.mk b/source/scripting/ejs/ejsnet/config.mk
index 85a5b2bf091..cf52de056ef 100644
--- a/source/scripting/ejs/ejsnet/config.mk
+++ b/source/scripting/ejs/ejsnet/config.mk
@@ -4,7 +4,7 @@ INIT_FUNCTION = smb_setup_ejs_net
 PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
 
-smbcalls_net_OBJ_FILES = $(addprefix scripting/ejs/ejsnet/,  \
+smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/,  \
 		net_ctx.o \
 		net_user.o \
 		mpr_user.o \