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/lib/registry | |
| 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/lib/registry')
| -rw-r--r-- | source4/lib/registry/SConscript | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/registry/SConscript b/source4/lib/registry/SConscript index aa2d587260..f2fa526a67 100644 --- a/source4/lib/registry/SConscript +++ b/source4/lib/registry/SConscript @@ -2,19 +2,19 @@ Import('hostenv paths') # tastes like -*- python -*- Import('talloc basic popt_common popt param') -registry = hostenv.StaticLibrary('registry', +registry = hostenv.Library('registry', [basic,talloc,'common/reg_interface.c','common/reg_util.c']) regtree = hostenv.Program('regtree', ['tools/regtree.c',registry,talloc,basic,popt_common,popt,param]) regshell = hostenv.Program('regshell', ['tools/regshell.c',registry,talloc,basic,popt_common,popt,param]) regpatch = hostenv.Program('regpatch', ['tools/regpatch.c',registry,talloc,basic,popt_common,popt,param]) regdiff = hostenv.Program('regdiff', ['tools/regdiff.c',registry,talloc,basic,popt_common,popt,param]) -hostenv.StaticLibrary('reg_backend_dir.c') -hostenv.StaticLibrary('reg_backend_gconf.c') -hostenv.StaticLibrary('reg_backend_ldb.c') -hostenv.StaticLibrary('reg_backend_nt4', ['reg_backend_nt4.c',hostenv.TdrMarshaller('regf.idl')]) -hostenv.StaticLibrary('reg_backend_rpc.c') -hostenv.StaticLibrary('reg_backend_w95.c') -hostenv.StaticLibrary('reg_backend_wine.c') +hostenv.Library('reg_backend_dir.c') +hostenv.Library('reg_backend_gconf.c') +hostenv.Library('reg_backend_ldb.c') +hostenv.Library('reg_backend_nt4', ['reg_backend_nt4.c',hostenv.TdrMarshaller('regf.idl')]) +hostenv.Library('reg_backend_rpc.c') +hostenv.Library('reg_backend_w95.c') +hostenv.Library('reg_backend_wine.c') hostenv.Install(paths['BINDIR'], [regtree,regshell,regpatch,regdiff]) |