diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-21 16:29:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:06 -0500 |
| commit | 4c5a4a7e0288e9ac0b2f795befd5684059e4c429 (patch) | |
| tree | e4ba25456c59c45b535225cae34228f69e3d0551 /source4/scripting | |
| parent | 568dd26ac783385c1c2a69a392f5a569ebdd13a2 (diff) | |
| download | samba-4c5a4a7e0288e9ac0b2f795befd5684059e4c429.tar.gz samba-4c5a4a7e0288e9ac0b2f795befd5684059e4c429.tar.bz2 samba-4c5a4a7e0288e9ac0b2f795befd5684059e4c429.zip | |
r11244: Relative path names in .mk files
(This used to be commit 24e10300906c380919d2d631bfb3b8fd6b3f54ba)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/config.mk | 2 | ||||
| -rw-r--r-- | source4/scripting/ejs/config.mk | 38 |
2 files changed, 21 insertions, 19 deletions
diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk index 9e6be54457..69a5dd4efe 100644 --- a/source4/scripting/config.mk +++ b/source4/scripting/config.mk @@ -1,3 +1,5 @@ +include ejs/config.mk + ####################### # Start LIBRARY swig_tdb [LIBRARY::swig_tdb] diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index b997a656ab..a53c378e9d 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -2,7 +2,7 @@ # Start LIBRARY EJSRPC [SUBSYSTEM::EJSRPC] OBJ_FILES = \ - scripting/ejs/ejsrpc.o + ejsrpc.o REQUIRED_SUBSYSTEMS = RPC_EJS NOPROTO = YES # End SUBSYSTEM EJSRPC @@ -12,23 +12,23 @@ NOPROTO = YES # Start LIBRARY SMBCALLS [SUBSYSTEM::SMBCALLS] OBJ_FILES = \ - scripting/ejs/smbcalls.o \ - scripting/ejs/smbcalls_config.o \ - scripting/ejs/smbcalls_ldb.o \ - scripting/ejs/smbcalls_nbt.o \ - scripting/ejs/smbcalls_cli.o \ - scripting/ejs/smbcalls_rpc.o \ - scripting/ejs/smbcalls_auth.o \ - scripting/ejs/smbcalls_options.o \ - scripting/ejs/smbcalls_nss.o \ - scripting/ejs/smbcalls_string.o \ - scripting/ejs/smbcalls_data.o \ - scripting/ejs/smbcalls_rand.o \ - scripting/ejs/smbcalls_sys.o \ - scripting/ejs/smbcalls_creds.o \ - scripting/ejs/smbcalls_samba3.o \ - scripting/ejs/smbcalls_param.o \ - scripting/ejs/mprutil.o + smbcalls.o \ + smbcalls_config.o \ + smbcalls_ldb.o \ + smbcalls_nbt.o \ + smbcalls_cli.o \ + smbcalls_rpc.o \ + smbcalls_auth.o \ + smbcalls_options.o \ + smbcalls_nss.o \ + smbcalls_string.o \ + smbcalls_data.o \ + smbcalls_rand.o \ + smbcalls_sys.o \ + smbcalls_creds.o \ + smbcalls_samba3.o \ + smbcalls_param.o \ + mprutil.o REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 # End SUBSYSTEM SMBCALLS ####################### @@ -38,7 +38,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 [BINARY::smbscript] INSTALLDIR = BINDIR OBJ_FILES = \ - scripting/ejs/smbscript.o + smbscript.o REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE # End BINARY SMBSCRIPT ####################### |