summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-28 18:18:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:08 -0500
commit5058f4b9e82ca8b9f2405930db3a46b8c37f06ed (patch)
tree008fb92b76381b2070568a27b905ff64608cb2b0 /source4/scripting
parent09ee7a470ba052d184f94336cd7635efca387ace (diff)
downloadsamba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.gz
samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.bz2
samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.zip
r10586: Add MergedObject() builder. Default to Library() rather
then StaticLibrary() (This used to be commit b53313dc517986c69a4e4cb8fe3885b696f8faa1)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/ejs/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
index 5ba45d8e77..43a73a92a0 100644
--- a/source4/scripting/ejs/SConscript
+++ b/source4/scripting/ejs/SConscript
@@ -1,7 +1,7 @@
Import('hostenv')
-hostenv.StaticLibrary('ejsrpc',['ejsrpc.c'])
-hostenv.StaticLibrary('ejs_smbcalls',
+hostenv.Library('ejsrpc',['ejsrpc.c'])
+hostenv.Library('ejs_smbcalls',
['smbcalls.c','smbcalls_config.c','smbcalls_ldb.c',
'smbcalls_nbt.c','smbcalls_cli.c','smbcalls_rpc.c',
'smbcalls_auth.c','smbcalls_options.c','smbcalls_nss.c',