diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-28 18:18:09 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:08 -0500 |
commit | 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed (patch) | |
tree | 008fb92b76381b2070568a27b905ff64608cb2b0 /source4/param | |
parent | 09ee7a470ba052d184f94336cd7635efca387ace (diff) | |
download | samba-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/param')
-rw-r--r-- | source4/param/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/param/SConscript b/source4/param/SConscript index 2b8eb89b30..b93cc342cd 100644 --- a/source4/param/SConscript +++ b/source4/param/SConscript @@ -3,8 +3,8 @@ Import('hostenv') Import('dynconfig basic') param_files = ['loadparm.c','params.c'] -param = hostenv.StaticLibrary('loadparm',[param_files,dynconfig,basic]) +param = hostenv.Library('loadparm',[param_files,dynconfig,basic]) hostenv.proto_headers += hostenv.CProtoHeader('proto.h', param_files) Export('param') -generic = hostenv.StaticLibrary('generic',['generic.c']) +generic = hostenv.Library('generic',['generic.c']) Export('generic') |