r10586: Add MergedObject() builder. Default to Library() rather

then StaticLibrary()
(This used to be commit b53313dc517986c69a4e4cb8fe3885b696f8faa1)

18 files changed, 50 insertions, 50 deletions

diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index a184eecd10..be77e8621d 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -13,29 +13,29 @@ basic_files = ['version.c', 'xfile.c', 'debug.c', 'fault.c',
 
 proto_files = basic_files
 
-basic = hostenv.StaticLibrary('basic', [dynconfig,charset,talloc,basic_files,charset])
+basic = hostenv.Library('basic', [dynconfig,charset,talloc,basic_files])
 Export('basic')
 
-hostenv.StaticLibrary('tdr', ['tdr/tdr.c'])
-hostenv.StaticLibrary('crypto', 
+hostenv.Library('tdr', ['tdr/tdr.c'])
+hostenv.Library('crypto', 
 		['crypto/crc32.c','crypto/md5.c','crypto/hmacmd5.c',
 		'crypto/md4.c','crypto/arcfour.c'])
-hostenv.StaticLibrary('compression', ['compression/mszip.c'])
-hostenv.StaticLibrary('gencache',['gencache.c'])
-hostenv.StaticLibrary('pidfile',['pidfile.c'])
-hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
+hostenv.Library('compression', ['compression/mszip.c'])
+hostenv.Library('gencache',['gencache.c'])
+hostenv.Library('pidfile',['pidfile.c'])
+hostenv.Library('unix_privs',['unix_privs.c'])
 
 SConscript(dirs=['ldb'])
 
 Import('ldb')
 gendb_files = ['gendb.c']
 proto_files += gendb_files
-gendb = hostenv.StaticLibrary('gendb', [gendb_files,ldb])
+gendb = hostenv.Library('gendb', [gendb_files,ldb])
 Export('gendb')
 
 credentials_files = ['credentials.c']
 proto_files += credentials_files
-credentials = hostenv.StaticLibrary('credentials',[credentials_files,basic,gendb])
+credentials = hostenv.Library('credentials',[credentials_files,basic,gendb])
 Export('credentials')
 
 hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
diff --git a/source4/lib/appweb/SConscript b/source4/lib/appweb/SConscript
index 2c8238b67c..6ffcaa23ec 100644
--- a/source4/lib/appweb/SConscript
+++ b/source4/lib/appweb/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('mpr',['mpr/miniMpr.c','mpr/var.c'])
-hostenv.StaticLibrary('ejs',['ejs/ejsLib.c','ejs/ejsLex.c','ejs/ejsParser.c','ejs/ejsProcs.c'])
-hostenv.StaticLibrary('esp',['esp/esp.c','esp/espProcs.c'])
+hostenv.Library('mpr',['mpr/miniMpr.c','mpr/var.c'])
+hostenv.Library('ejs',['ejs/ejsLib.c','ejs/ejsLex.c','ejs/ejsParser.c','ejs/ejsProcs.c'])
+hostenv.Library('esp',['esp/esp.c','esp/espProcs.c'])
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index 5ef640d2dc..9bc474ff48 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -62,5 +62,5 @@ if hostenv['configure']:
 else:
 	iconv = [] # FIXME
 
-charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c',iconv])
+charset = hostenv.Library('charset',['iconv.c','charcnv.c',iconv])
 Export('charset')
diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript
index 12f4f7c11c..4a2047f071 100644
--- a/source4/lib/cmdline/SConscript
+++ b/source4/lib/cmdline/SConscript
@@ -2,5 +2,5 @@ Import('hostenv')
 #            tastes like -*- python -*-
 
 Import('basic param credentials')
-popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param,credentials])
+popt_common = hostenv.Library('popt_common',['popt_common.c',basic,param,credentials])
 Export('popt_common')
diff --git a/source4/lib/com/SConscript b/source4/lib/com/SConscript
index 44708bdf32..797cd37620 100644
--- a/source4/lib/com/SConscript
+++ b/source4/lib/com/SConscript
@@ -1,4 +1,4 @@
 Import('hostenv')
-hostenv.StaticLibrary('com', [ 'tables.c','rot.c','main.c'])
-hostenv.StaticLibrary('dcom', [ 'dcom/tables.c','dcom/main.c'])
-hostenv.StaticLibrary('com_simple', ['classes/simple.c'])
+hostenv.Library('com', [ 'tables.c','rot.c','main.c'])
+hostenv.Library('dcom', [ 'dcom/tables.c','dcom/main.c'])
+hostenv.Library('com_simple', ['classes/simple.c'])
diff --git a/source4/lib/events/SConscript b/source4/lib/events/SConscript
index e1ca866233..a8a6c08657 100644
--- a/source4/lib/events/SConscript
+++ b/source4/lib/events/SConscript
@@ -1,3 +1,3 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('events',['events.c','events_standard.c'])
+hostenv.Library('events',['events.c','events_standard.c'])
diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript
index 6dfb53f789..8e246d1961 100644
--- a/source4/lib/ldb/SConscript
+++ b/source4/lib/ldb/SConscript
@@ -12,32 +12,32 @@ if hostenv['configure']:
     conf.Finish()
 
 if defines.has_key('HAVE_SQLITE3'):
-    hostenv.StaticLibrary('ldb_sqlite3/ldb_sqlite3.c')
+    hostenv.Library('ldb_sqlite3/ldb_sqlite3.c')
 
 # LDB modules
 
 modules = []
 
-modules.append(hostenv.StaticLibrary('modules/timestamps.c'))
-modules.append(hostenv.StaticLibrary('modules/rdn_name.c'))
-modules.append(hostenv.StaticLibrary('modules/schema.c'))
-modules.append(hostenv.StaticLibrary('ldb_ildap/ldb_ildap.c'))
-#modules.append(hostenv.StaticLibrary('modules/ldb_map.c'))
+modules.append(hostenv.Library('modules/timestamps.c'))
+modules.append(hostenv.Library('modules/rdn_name.c'))
+modules.append(hostenv.Library('modules/schema.c'))
+modules.append(hostenv.Library('ldb_ildap/ldb_ildap.c'))
+#modules.append(hostenv.Library('modules/ldb_map.c'))
 
 Import('dsdb_ldb_modules')
 modules += dsdb_ldb_modules
 
-modules.append(hostenv.StaticLibrary(
+modules.append(hostenv.Library(
     'ldb_tdb',
     ['ldb_tdb/ldb_tdb.c', 'ldb_tdb/ldb_search.c', 'ldb_tdb/ldb_pack.c',
      'ldb_tdb/ldb_index.c', 'ldb_tdb/ldb_cache.c', 'ldb_tdb/ldb_tdb_wrap.c']))
 	       
-#modules.append(hostenv.StaticLibrary('ldb_ildap', ['ldb_ildap/ldb_ildap.c']))
+#modules.append(hostenv.Library('ldb_ildap', ['ldb_ildap/ldb_ildap.c']))
 
 # Export the ldb base plus modules for other parts of the build system
 # to enjoy.
 
-ldb = hostenv.StaticLibrary(
+ldb = hostenv.Library(
     'ldb',
     ['common/ldb.c', 'common/ldb_ldif.c', 'common/ldb_parse.c',
      'common/ldb_parse.c', 'common/ldb_msg.c', 'common/ldb_utf8.c',
@@ -46,8 +46,8 @@ ldb = hostenv.StaticLibrary(
 
 Export('ldb')
 
-hostenv.StaticLibrary('samba/ldif_handlers.c')
-ldb_cmdline = hostenv.StaticLibrary('ldb_cmdline', 'tools/cmdline.c')
+hostenv.Library('samba/ldif_handlers.c')
+ldb_cmdline = hostenv.Library('ldb_cmdline', 'tools/cmdline.c')
 
 # Tools
 
diff --git a/source4/lib/messaging/SConscript b/source4/lib/messaging/SConscript
index 1d1ee5859b..7e060f0851 100644
--- a/source4/lib/messaging/SConscript
+++ b/source4/lib/messaging/SConscript
@@ -1,2 +1,2 @@
 Import('hostenv')
-hostenv.StaticLibrary('messaging','messaging.c')
+hostenv.Library('messaging','messaging.c')
diff --git a/source4/lib/netif/SConscript b/source4/lib/netif/SConscript
index 3e36fc55fe..7630d13236 100644
--- a/source4/lib/netif/SConscript
+++ b/source4/lib/netif/SConscript
@@ -19,4 +19,4 @@ if hostenv['configure']:
 
 	conf.Finish()
 
-hostenv.StaticLibrary('netif', ['interface.c', 'netif.c'])
+hostenv.Library('netif', ['interface.c', 'netif.c'])
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index 85f9c9b7e0..d9a576a031 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -7,5 +7,5 @@ if hostenv['configure']:
     conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);')
     conf.Finish()
 
-popt = hostenv.StaticLibrary('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c'])
+popt = hostenv.Library('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c'])
 Export('popt')
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])
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
index f45d0e7d5a..cf28102175 100644
--- a/source4/lib/replace/SConscript
+++ b/source4/lib/replace/SConscript
@@ -67,5 +67,5 @@ int main() {
 
 	conf.Finish()
 
-hostenv.StaticLibrary('replace', rep_files)
+hostenv.Library('replace', rep_files)
 SConscript(dirs=['win32'])
diff --git a/source4/lib/samba3/SConscript b/source4/lib/samba3/SConscript
index ba1f76b1a7..3fa9ea947b 100644
--- a/source4/lib/samba3/SConscript
+++ b/source4/lib/samba3/SConscript
@@ -1,4 +1,4 @@
 Import('hostenv')
-hostenv.StaticLibrary('samba3',
+hostenv.Library('samba3',
 		['smbpasswd.c','tdbsam.c','policy.c','idmap.c','winsdb.c','samba3.c',
 		'group.c','registry.c','secrets.c','share_info.c'])
diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript
index 26c8bf444c..73c7eeeeac 100644
--- a/source4/lib/socket/SConscript
+++ b/source4/lib/socket/SConscript
@@ -57,8 +57,8 @@ int main(void)
 
 	conf.Finish()
 
-hostenv.StaticLibrary('socket_ipv4.c')
-hostenv.StaticLibrary('socket_ipv6.c')
-hostenv.StaticLibrary('socket_unix.c')
-hostenv.StaticLibrary('socket', ['socket.c','access.c','connect.c'])
+hostenv.Library('socket_ipv4.c')
+hostenv.Library('socket_ipv6.c')
+hostenv.Library('socket_unix.c')
+hostenv.Library('socket', ['socket.c','access.c','connect.c'])
 
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index 1c0253a0d4..248922bcd7 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -9,6 +9,6 @@ opts.Update(hostenv)
 
 if hostenv['socket_wrapper']:
 	hostenv.Append(CPPDEFINES = {'HAVE_SOCKET_WRAPPER': 1})
-	socket_wrapper = hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c'])
+	socket_wrapper = hostenv.Library('socket_wrapper',['socket_wrapper.c'])
 else:
 	socket_wrapper = []
diff --git a/source4/lib/talloc/SConscript b/source4/lib/talloc/SConscript
index ad88262f1d..222a00e001 100644
--- a/source4/lib/talloc/SConscript
+++ b/source4/lib/talloc/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
 #            tastes like -*- python -*-
 
-talloc = hostenv.StaticLibrary('talloc',['talloc.c'])
+talloc = hostenv.Library('talloc',['talloc.c'])
 Export('talloc')
diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript
index 22f7f34ca5..9eb347f3ac 100644
--- a/source4/lib/tdb/SConscript
+++ b/source4/lib/tdb/SConscript
@@ -7,7 +7,7 @@ tdb_source = ['common/tdb.c','common/dump.c','common/io.c','common/lock.c',
              'common/open.c','common/traverse.c','common/freelist.c',
              'common/error.c','common/transaction.c', 'common/tdbutil.c']
 
-tdb = tdbenv.StaticLibrary('tdb', tdb_source)
+tdb = tdbenv.Library('tdb', tdb_source)
 
 tdbtool = tdbenv.Program('bin/tdbtool', ['tools/tdbtool.c',tdb])
 tdbtorture = tdbenv.Program('bin/tdbtorture', ['tools/tdbtorture.c',tdb])
diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript
index 941955e9e3..452eaeeddc 100644
--- a/source4/lib/tls/SConscript
+++ b/source4/lib/tls/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
-hostenv.StaticLibrary('tls', ['tls.c', 'tlscert.c'])
+hostenv.Library('tls', ['tls.c', 'tlscert.c'])
 
 if hostenv['configure']:
     conf = hostenv.Configure()