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

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

45 files changed, 194 insertions, 161 deletions

diff --git a/source4/SConstruct b/source4/SConstruct
index 297147fbe3f..4fd59b7d503 100644
--- a/source4/SConstruct
+++ b/source4/SConstruct
@@ -24,7 +24,7 @@ opts.AddOptions(
 
 hostenv = Environment(
 		toolpath=['build/scons','.'],
-		tools=['default','pidl','proto','et','asn1'],
+		tools=['default','pidl','proto','et','asn1','samba'],
 		options=opts,
 		CPPPATH=['#include','#','#lib'], 
         CPPDEFINES={'_SAMBA_BUILD_': None},
diff --git a/source4/auth/SConscript b/source4/auth/SConscript
index 7b1358b9081..f5151fd97f2 100644
--- a/source4/auth/SConscript
+++ b/source4/auth/SConscript
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 Import('hostenv')
 
-hostenv.StaticLibrary('auth_sam.c')
-hostenv.StaticLibrary('auth_anonymous.c')
-hostenv.StaticLibrary('auth_winbind.c')
-hostenv.StaticLibrary('auth_domain.c')
-hostenv.StaticLibrary('auth_developer.c')
-hostenv.StaticLibrary('auth_unix.c')
+hostenv.Library('auth_sam.c')
+hostenv.Library('auth_anonymous.c')
+hostenv.Library('auth_winbind.c')
+hostenv.Library('auth_domain.c')
+hostenv.Library('auth_developer.c')
+hostenv.Library('auth_unix.c')
 
 if hostenv['configure']:
     conf = hostenv.Configure()
@@ -14,17 +14,17 @@ if hostenv['configure']:
     conf.Finish()
 
 proto_files = []
-hostenv.StaticLibrary('pam_errors.c')
+hostenv.Library('pam_errors.c')
 proto_files += ['pam_errors.c', 'auth_sam.c']
 auth_files = ['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c']
 proto_files += auth_files
-hostenv.StaticLibrary('auth',auth_files)
+hostenv.Library('auth',auth_files)
 
 ntlmssp_files = ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c',
 		'ntlmssp/ntlmssp_sign.c','ntlmssp/ntlmssp_client.c',
 		'ntlmssp/ntlmssp_server.c'] 
 proto_files += ntlmssp_files
-hostenv.StaticLibrary('gensec_ntlmssp', ntlmssp_files)
+hostenv.Library('gensec_ntlmssp', ntlmssp_files)
 
 kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c',
 	'kerberos/kerberos_verify.c','kerberos/kerberos_util.c',
@@ -33,7 +33,7 @@ kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c',
 
 proto_files += kerberos_files
 
-hostenv.StaticLibrary('kerberos', kerberos_files)
+hostenv.Library('kerberos', kerberos_files)
 
 hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
 
diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript
index 3c90d2b4ebf..b576a7afb9f 100644
--- a/source4/auth/gensec/SConscript
+++ b/source4/auth/gensec/SConscript
@@ -6,9 +6,9 @@ gensec_files = ['gensec.c', 'gensec_krb5.c', 'gensec_gssapi.c', 'spnego.c',
 
 hostenv.proto_headers += hostenv.CProtoHeader('proto.h', gensec_files)
 
-hostenv.StaticLibrary('gensec',['gensec.c'])
-hostenv.StaticLibrary('gensec_krb5',['gensec_krb5.c'])
-hostenv.StaticLibrary('gensec_gssapi',['gensec_gssapi.c'])
-hostenv.StaticLibrary('gensec_spnego',['spnego.c','spnego_parse.c'])
-hostenv.StaticLibrary('gensec_schannel',['schannel.c','schannel_sign.c'])
-hostenv.StaticLibrary('schanneldb',['schannel_state.c'])
+hostenv.Library('gensec',['gensec.c'])
+hostenv.Library('gensec_krb5',['gensec_krb5.c'])
+hostenv.Library('gensec_gssapi',['gensec_gssapi.c'])
+hostenv.Library('gensec_spnego',['spnego.c','spnego_parse.c'])
+hostenv.Library('gensec_schannel',['schannel.c','schannel_sign.c'])
+hostenv.Library('schanneldb',['schannel_state.c'])
diff --git a/source4/build/scons/samba.py b/source4/build/scons/samba.py
new file mode 100644
index 00000000000..949be1c41a6
--- /dev/null
+++ b/source4/build/scons/samba.py
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+
+import SCons.Defaults
+import SCons.Util
+
+# Samba contains different "subsystems":
+# - binaries. Program()
+#   receive list of component init functions
+# - "real" subsystems (that you might want to use as shared libs, 
+# and depend on such as RPC, NDR, REGISTRY, SAMR, LDAP_SERVER, GENSEC, etc). "Libraries"
+#   have init_function that receives list of backend init functions
+# - parts of subsystems (RPC_RAW, NDR_RAW, REGISTRY_CORE). have "parent". can have convienience init_function. Module()
+# - optional parts of subsystems (RPC_SMB, REGISTRY_NT4, SERVER_SERVICE_LDAP). also have "parent". have init_function
+
+# Library() builder
+# autoproto=True/False
+# proto_file=(defaults to include/proto.h)
+# optional=True/False
+# automatically get dependency on LIBREPLACE (unless this is LIBREPLACE, of course)
+#def library(env, target, source = None, autoproto = False, proto_file = None, optional = False):
+#	print "IEKS: %s, %s\n" % (target, env['CC'])
+
+mergedobj_builder = SCons.Builder.Builder(action='ld -r -o $TARGET $SOURCES',
+                                     src_suffix='$OBJSUFFIX',
+                                     suffix='.mo',
+									 src_builder='StaticObject'
+									 )
+
+def generate(env):
+	env['BUILDERS']['MergedObject'] = mergedobj_builder
+	#env['BUILDERS']['Library'] = library
+
+def exists(env):
+	return True
diff --git a/source4/cldap_server/SConscript b/source4/cldap_server/SConscript
index b975976daa0..c81ab745fc6 100644
--- a/source4/cldap_server/SConscript
+++ b/source4/cldap_server/SConscript
@@ -1,2 +1,2 @@
 Import('hostenv')
-hostenv.StaticLibrary('cldap_server',['cldap_server.c','netlogon.c'])
+hostenv.Library('cldap_server',['cldap_server.c','netlogon.c'])
diff --git a/source4/dsdb/SConscript b/source4/dsdb/SConscript
index e5708ac62b4..cdbf1461495 100644
--- a/source4/dsdb/SConscript
+++ b/source4/dsdb/SConscript
@@ -3,18 +3,18 @@ Import('hostenv')
 dsdb_ldb_modules = []
 
 dsdb_ldb_modules.append(
-	hostenv.StaticLibrary('ldb_objectguid',
+	hostenv.Library('ldb_objectguid',
 	['samdb/ldb_modules/objectguid.c']))
 
 dsdb_ldb_modules.append(
-	hostenv.StaticLibrary('ldb_samldb',['samdb/ldb_modules/samldb.c']))
+	hostenv.Library('ldb_samldb',['samdb/ldb_modules/samldb.c']))
 
 dsdb_ldb_modules.append(
-	hostenv.StaticLibrary('ldb_samba3sam',
+	hostenv.Library('ldb_samba3sam',
 	['samdb/ldb_modules/samba3sam.c']))
 
 Export('dsdb_ldb_modules')
 
 samdb_files = ['samdb/samdb.c','samdb/samdb_privilege.c','common/flag_mapping.c']
-hostenv.StaticLibrary('samdb',samdb_files)
+hostenv.Library('samdb',samdb_files)
 hostenv.proto_headers += hostenv.CProtoHeader(samdb_files)
diff --git a/source4/gtk/SConscript b/source4/gtk/SConscript
index 4c45991c860..2e9eda33933 100644
--- a/source4/gtk/SConscript
+++ b/source4/gtk/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
-gtksmb = hostenv.StaticLibrary('gtksmb',
+gtksmb = hostenv.Library('gtksmb',
 		['common/gtk-smb.c','common/select.c',
 		'common/gtk_events.c','common/credentials.c'])
 
diff --git a/source4/heimdal_build/SConscript b/source4/heimdal_build/SConscript
index b90be7ba81b..17d9273688f 100644
--- a/source4/heimdal_build/SConscript
+++ b/source4/heimdal_build/SConscript
@@ -3,7 +3,7 @@ Import('buildenv hostenv defines')
 if hostenv['configure']:
 	defines['HAVE_KRB5'] = 1
 
-hostenv.StaticLibrary('heimdal_kdc',
+hostenv.Library('heimdal_kdc',
 	['../kdc/default_config.c','../kdc/kerberos5.c','../kdc/pkinit.c',
 	 '../kdc/log.c','../kdc/misc.c','../kdc/524.c','../kdc/kerberos4.c',
 	 '../kdc/kaserver.c','../kdc/process.c'])
@@ -12,12 +12,12 @@ hdb_asn1 = hostenv.ASN1('../heimdal/lib/hdb/hdb.asn1',ASN1PREFIX='hdb_asn1')
 gssapi_asn1 = hostenv.ASN1('../heimdal/lib/gssapi/spnego.asn1',ASN1PREFIX='spnego_asn1')
 k5_asn1 = hostenv.ASN1('../heimdal/lib/asn1/k5.asn1',ASN1PREFIX='k5_asn1')
 
-hostenv.StaticLibrary('heimdal_hdb',
+hostenv.Library('heimdal_hdb',
 	['../heimdal/lib/hdb/db.c','../heimdal/lib/hdb/hdb.c','../heimdal/lib/hdb/ext.c','../heimdal/lib/hdb/keys.c',
 	'../heimdal/lib/hdb/mkey.c','../heimdal/lib/hdb/ndbm.c',hdb_asn1,
 	hostenv.ErrorTable('../heimdal/lib/hdb/hdb_err.et')])
 
-hostenv.StaticLibrary('heimdal_gssapi',
+hostenv.Library('heimdal_gssapi',
 	['../heimdal/lib/gssapi/init_sec_context.c','../heimdal/lib/gssapi/inquire_cred.c',
 	'../heimdal/lib/gssapi/release_buffer.c','../heimdal/lib/gssapi/release_cred.c',
 	'../heimdal/lib/gssapi/release_name.c','../heimdal/lib/gssapi/release_oid_set.c',
@@ -35,7 +35,7 @@ hostenv.StaticLibrary('heimdal_gssapi',
 	'../heimdal/lib/gssapi/encapsulate.c','../heimdal/lib/gssapi/external.c',
 	'../heimdal/lib/gssapi/get_mic.c','../heimdal/lib/gssapi/import_name.c','../heimdal/lib/gssapi/init.c'])
 
-hostenv.StaticLibrary('heimdal_krb5',
+hostenv.Library('heimdal_krb5',
 	['../heimdal/lib/krb5/acache.c','../heimdal/lib/krb5/add_et_list.c','../heimdal/lib/krb5/addr_families.c',
 	'../heimdal/lib/krb5/appdefault.c','../heimdal/lib/krb5/asn1_glue.c','../heimdal/lib/krb5/auth_context.c',
 	'../heimdal/lib/krb5/build_ap_req.c','../heimdal/lib/krb5/build_auth.c','../heimdal/lib/krb5/cache.c',
@@ -70,22 +70,22 @@ hostenv.StaticLibrary('heimdal_krb5',
 	hostenv.ErrorTable('../heimdal/lib/krb5/heim_err.et'),
 	hostenv.ErrorTable('../heimdal/lib/krb5/k524_err.et')])
 
-hostenv.StaticLibrary('heimdal_asn1', k5_asn1)
+hostenv.Library('heimdal_asn1', k5_asn1)
 
-hostenv.StaticLibrary('heimdal_des',
+hostenv.Library('heimdal_des',
 	['../heimdal/lib/des/aes.c','../heimdal/lib/des/des.c','../heimdal/lib/des/md4.c','../heimdal/lib/des/md5.c',
 	'../heimdal/lib/des/rc2.c','../heimdal/lib/des/rc4.c','../heimdal/lib/des/rijndael-alg-fst.c',
 	'../heimdal/lib/des/rnd_keys.c','../heimdal/lib/des/sha.c','../heimdal/lib/des/ui.c'])
 
-hostenv.StaticLibrary('roken_gai_strerror', ['../heimdal/lib/roken/gai_strerror.c'])
-hostenv.StaticLibrary('roken_inet_aton', ['../heimdal/lib/roken/inet_aton.c'])
-hostenv.StaticLibrary('roken_addrinfo', 
+hostenv.Library('roken_gai_strerror', ['../heimdal/lib/roken/gai_strerror.c'])
+hostenv.Library('roken_inet_aton', ['../heimdal/lib/roken/inet_aton.c'])
+hostenv.Library('roken_addrinfo', 
 	['../heimdal/lib/roken/getaddrinfo.c','../heimdal/lib/roken/freeaddrinfo.c',
 	 '../heimdal/lib/roken/getipnodebyaddr.c','../heimdal/lib/roken/getipnodebyname.c',
 	 '../heimdal/lib/roken/freehostent.c', '../heimdal/lib/roken/copyhostent.c',
 	 '../heimdal/lib/roken/hostent_find_fqdn.c'])
 
-hostenv.StaticLibrary('roken',
+hostenv.Library('roken',
 	['../heimdal/lib/roken/base64.c','../heimdal/lib/roken/bswap.c','../heimdal/lib/roken/get_window_size.c',
 	'../heimdal/lib/roken/getprogname.c','../heimdal/lib/roken/h_errno.c','../heimdal/lib/roken/issuid.c',
 	'../heimdal/lib/roken/net_read.c','../heimdal/lib/roken/net_write.c','../heimdal/lib/roken/parse_time.c',
@@ -94,9 +94,9 @@ hostenv.StaticLibrary('roken',
 	'../heimdal/lib/roken/strlwr.c','../heimdal/lib/roken/strsep_copy.c','../heimdal/lib/roken/strupr.c',
 	'../heimdal/lib/roken/strpool.c','heimdal_build/replace.c'])
 
-hostenv.StaticLibrary('heimdal_vers',['../heimdal/lib/version/print_version.c'])
-hostenv.StaticLibrary('heimdal_glue',['heimdal_build/glue.c'])
-hostenv.StaticLibrary('heimdal_com_err',
+hostenv.Library('heimdal_vers',['../heimdal/lib/version/print_version.c'])
+hostenv.Library('heimdal_glue',['heimdal_build/glue.c'])
+hostenv.Library('heimdal_com_err',
 	['../heimdal/lib/com_err/com_err.c','../heimdal/lib/com_err/error.c'])
 
 buildenv.Program('asn1_compile',
diff --git a/source4/kdc/SConscript b/source4/kdc/SConscript
index 98f5e3abc23..24539257560 100644
--- a/source4/kdc/SConscript
+++ b/source4/kdc/SConscript
@@ -1,2 +1,2 @@
 Import('hostenv')
-hostenv.StaticLibrary('kdc',['kdc.c','pac-glue.c','hdb-ldb.c'])
+hostenv.Library('kdc',['kdc.c','pac-glue.c','hdb-ldb.c'])
diff --git a/source4/ldap_server/SConscript b/source4/ldap_server/SConscript
index 97210cc1e0b..d44da9b0840 100644
--- a/source4/ldap_server/SConscript
+++ b/source4/ldap_server/SConscript
@@ -1,4 +1,4 @@
 Import('hostenv')
-hostenv.StaticLibrary('ldap_server', 
+hostenv.Library('ldap_server', 
 		['ldap_server.c','ldap_backend.c','ldap_bind.c','ldap_rootdse.c',
 	 	 'ldap_simple_ldb.c','ldap_hacked_ldb.c'])
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index a184eecd105..be77e8621d8 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 2c8238b67c8..6ffcaa23ec1 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 5ef640d2dc0..9bc474ff48b 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 12f4f7c11c4..4a2047f0716 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 44708bdf328..797cd37620d 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 e1ca8662337..a8a6c086578 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 6dfb53f7892..8e246d1961d 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 1d1ee5859bb..7e060f0851c 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 3e36fc55fee..7630d132368 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 85f9c9b7e0f..d9a576a031c 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 aa2d5872601..f2fa526a671 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 f45d0e7d5ac..cf281021758 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 ba1f76b1a76..3fa9ea947b3 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 26c8bf444c7..73c7eeeeace 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 1c0253a0d4e..248922bcd7f 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 ad88262f1dd..222a00e0015 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 22f7f34ca53..9eb347f3acf 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 941955e9e3b..452eaeeddcb 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()
diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript
index 76143b97cfc..aa911d9838a 100644
--- a/source4/libcli/SConscript
+++ b/source4/libcli/SConscript
@@ -2,41 +2,41 @@ Import('hostenv')
 proto_files = []
 cli_utils_files = ['util/asn1.c', 'util/doserr.c','util/errormap.c','util/clierror.c', 'util/nterr.c','util/smbdes.c']
 proto_files += cli_utils_files
-hostenv.StaticLibrary('cli_utils', cli_utils_files)
+hostenv.Library('cli_utils', cli_utils_files)
 
-hostenv.StaticLibrary('cli_lsa', ['util/clilsa.c'])
-hostenv.StaticLibrary('cli_composite_base', ['composite/composite.c'])
+hostenv.Library('cli_lsa', ['util/clilsa.c'])
+hostenv.Library('cli_composite_base', ['composite/composite.c'])
 
-cli_composite_files = ['composite/loadfile.c','composite/savefile.c','composite/connect.c',
-	 'composite/sesssetup.c','composite/fetchfile.c','composite/appendacl.c',
-	 'composite/fsinfo.c']
+cli_composite_files = ['smb_composite/loadfile.c','smb_composite/savefile.c','smb_composite/connect.c',
+	 'smb_composite/sesssetup.c','smb_composite/fetchfile.c','smb_composite/appendacl.c',
+	 'smb_composite/fsinfo.c']
 
-hostenv.StaticLibrary('cli_composite', cli_composite_files)
+hostenv.Library('cli_composite', cli_composite_files)
 proto_files += ['util/clilsa.c', 'composite/composite.c'] + cli_composite_files
 
 cli_nbt_files = ['nbt/nbtname.c','nbt/nbtsocket.c','nbt/namequery.c','nbt/nameregister.c',
 	'nbt/namerefresh.c','nbt/namerelease.c']
 
-hostenv.StaticLibrary('cli_nbt', cli_nbt_files)
+hostenv.Library('cli_nbt', cli_nbt_files)
 proto_files += cli_nbt_files
 
-hostenv.StaticLibrary('cli_dgram',
+hostenv.Library('cli_dgram',
 	[ 'dgram/dgramsocket.c','dgram/mailslot.c','dgram/netlogon.c',
 	 'dgram/ntlogon.c','dgram/browse.c'])
 
-hostenv.StaticLibrary('cli_cldap', ['cldap/cldap.c'])
-hostenv.StaticLibrary('cli_wrepl', ['wrepl/winsrepl.c'])
+hostenv.Library('cli_cldap', ['cldap/cldap.c'])
+hostenv.Library('cli_wrepl', ['wrepl/winsrepl.c'])
 
 cli_resolve_files = ['resolve/resolve.c','resolve/nbtlist.c','resolve/bcast.c','resolve/wins.c',
 	'resolve/host.c']
 
-hostenv.StaticLibrary('cli_resolve', cli_resolve_files)
+hostenv.Library('cli_resolve', cli_resolve_files)
 proto_files += cli_resolve_files
 
 smb_files = ['clireadwrite.c', 'cliconnect.c','clifile.c','clilist.c','clitrans2.c',
 		'climessage.c','clideltree.c']
 
-hostenv.StaticLibrary('smb', smb_files)
+hostenv.Library('smb', smb_files)
 proto_files += smb_files
 
 cli_raw_files = ['raw/rawfile.c','raw/smb_signing.c','raw/clisocket.c',
@@ -47,23 +47,23 @@ cli_raw_files = ['raw/rawfile.c','raw/smb_signing.c','raw/clisocket.c',
 		'raw/rawfileinfo.c','raw/rawnotify.c','raw/rawioctl.c',
 		'raw/rawacl.c','raw/rawdate.c','raw/rawlpq.c']
 
-hostenv.StaticLibrary('cli_raw', cli_raw_files)
+hostenv.Library('cli_raw', cli_raw_files)
 proto_files += cli_raw_files
 
 security_files = ['security/security_token.c','security/security_descriptor.c',
 			   'security/dom_sid.c', 'security/access_check.c',
 			   'security/privilege.c', '../librpc/ndr/ndr_sec_helper.c']
 proto_files += security_files
-hostenv.StaticLibrary('cli_security', security_files)
+hostenv.Library('cli_security', security_files)
 
 auth_files = ['auth/credentials.c','auth/session.c','auth/smbencrypt.c']
 proto_files += auth_files
-hostenv.StaticLibrary('cli_auth',auth_files)
+hostenv.Library('cli_auth',auth_files)
 
 ldap_files = ['ldap/ldap.c','ldap/ldap_client.c','ldap/ldap_bind.c',
 		   'ldap/ldap_msg.c','ldap/ldap_ndr.c','ldap/ldap_ildap.c']
 proto_files += ldap_files
-cli_ldap = hostenv.StaticLibrary('cli_ldap',ldap_files)
+cli_ldap = hostenv.Library('cli_ldap',ldap_files)
 
 Export('cli_ldap')
 
diff --git a/source4/libnet/SConscript b/source4/libnet/SConscript
index 9c9793e731c..16eaabbe574 100644
--- a/source4/libnet/SConscript
+++ b/source4/libnet/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
-hostenv.StaticLibrary('net',
+hostenv.Library('net',
 		['libnet.c','libnet_passwd.c','libnet_time.c','libnet_rpc.c',
 		 'libnet_join.c','libnet_vampire.c','libnet_samdump.c',
 		 'libnet_samsync_ldb.c','libnet_user.c','libnet_share.c',
diff --git a/source4/librpc/SConscript b/source4/librpc/SConscript
index 9c9965eaaa3..083a84fc36e 100644
--- a/source4/librpc/SConscript
+++ b/source4/librpc/SConscript
@@ -4,17 +4,17 @@ Import('hostenv')
 ndr_base_files = ['ndr/ndr.c', 'ndr/ndr_basic.c', 'ndr/ndr_string.c',
 		  'ndr/ndr_obfuscate.c', 'ndr/ndr_misc.c'] 
 
-hostenv.StaticLibrary('ndr_base', ndr_base_files)
+hostenv.Library('ndr_base', ndr_base_files)
 hostenv.proto_headers += hostenv.CProtoHeader('ndr/proto.h', ndr_base_files)
 
-hostenv.StaticLibrary('ndr_compression',
+hostenv.Library('ndr_compression',
 		['ndr/ndr_compression.c'])
 
 rpc_base_files = ['rpc/dcerpc.c', 'rpc/dcerpc_auth.c', 'rpc/dcerpc_schannel.c',
 		  'rpc/dcerpc_util.c', 'rpc/dcerpc_error.c',
 		  'rpc/dcerpc_smb.c', 'rpc/dcerpc_sock.c'] 
 
-hostenv.StaticLibrary('rpc_base', rpc_base_files)
+hostenv.Library('rpc_base', rpc_base_files)
 hostenv.proto_headers += hostenv.CProtoHeader('rpc/proto.h', rpc_base_files)
 
 from glob import glob
diff --git a/source4/nbt_server/SConscript b/source4/nbt_server/SConscript
index d68c89db582..7617bd97648 100644
--- a/source4/nbt_server/SConscript
+++ b/source4/nbt_server/SConscript
@@ -1,6 +1,6 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('winsdb',['wins/winsdb.c'])
-hostenv.StaticLibrary('nbtd_wins',['wins/winsserver.c','wins/winsclient.c','wins/winswack.c'])
-hostenv.StaticLibrary('nbtd_dgram',['dgram/request.c','dgram/netlogon.c','dgram/ntlogon.c','dgram/browse.c'])
-hostenv.StaticLibrary('nbtd',['nbt_server.c','interfaces.c','register.c','query.c','nodestatus.c','defense.c','packet.c'])
+hostenv.Library('winsdb',['wins/winsdb.c'])
+hostenv.Library('nbtd_wins',['wins/winsserver.c','wins/winsclient.c','wins/winswack.c'])
+hostenv.Library('nbtd_dgram',['dgram/request.c','dgram/netlogon.c','dgram/ntlogon.c','dgram/browse.c'])
+hostenv.Library('nbtd',['nbt_server.c','interfaces.c','register.c','query.c','nodestatus.c','defense.c','packet.c'])
diff --git a/source4/nsswitch/SConscript b/source4/nsswitch/SConscript
index 47ee2c019a0..057ddba5f00 100644
--- a/source4/nsswitch/SConscript
+++ b/source4/nsswitch/SConscript
@@ -1,2 +1,2 @@
 Import('hostenv')
-hostenv.StaticLibrary('cli_winbind',['wb_common.c'])
+hostenv.Library('cli_winbind',['wb_common.c'])
diff --git a/source4/ntptr/SConscript b/source4/ntptr/SConscript
index 9660bd502b7..ea044ba0b80 100644
--- a/source4/ntptr/SConscript
+++ b/source4/ntptr/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
-hostenv.StaticLibrary('ntptr_simple_ldb',
+hostenv.Library('ntptr_simple_ldb',
 		['simple_ldb/ntptr_simple_ldb.c'])
-hostenv.StaticLibrary('ntptr',
+hostenv.Library('ntptr',
 		['ntptr_base.c','ntptr_interface.c'])
diff --git a/source4/ntvfs/SConscript b/source4/ntvfs/SConscript
index 16047eb4aeb..362eb8df2f4 100644
--- a/source4/ntvfs/SConscript
+++ b/source4/ntvfs/SConscript
@@ -1,11 +1,11 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('ntvfs_cifs',['cifs/vfs_cifs.c'])
-hostenv.StaticLibrary('ntvfs_simple',['simple/vfs_simple.c','simple/svfs_util.c'])
-hostenv.StaticLibrary('ntvfs_print',['print/vfs_print.c'])
-hostenv.StaticLibrary('ntvfs_ipc',['ipc/vfs_ipc.c','ipc/ipc_rap.c','ipc/rap_server.c'])
-hostenv.StaticLibrary('ntvfs_nbench',['nbench/vfs_nbench.c'])
-hostenv.StaticLibrary('ntvfs_common',['common/brlock.c','common/opendb.c','common/sidmap.c'])
-hostenv.StaticLibrary('ntvfs',['ntvfs_base.c','ntvfs_generic.c','ntvfs_interface.c','ntvfs_util.c'])
+hostenv.Library('ntvfs_cifs',['cifs/vfs_cifs.c'])
+hostenv.Library('ntvfs_simple',['simple/vfs_simple.c','simple/svfs_util.c'])
+hostenv.Library('ntvfs_print',['print/vfs_print.c'])
+hostenv.Library('ntvfs_ipc',['ipc/vfs_ipc.c','ipc/ipc_rap.c','ipc/rap_server.c'])
+hostenv.Library('ntvfs_nbench',['nbench/vfs_nbench.c'])
+hostenv.Library('ntvfs_common',['common/brlock.c','common/opendb.c','common/sidmap.c'])
+hostenv.Library('ntvfs',['ntvfs_base.c','ntvfs_generic.c','ntvfs_interface.c','ntvfs_util.c'])
 
 SConscript(dirs=['unixuid','posix'],exports='hostenv')
diff --git a/source4/ntvfs/posix/SConscript b/source4/ntvfs/posix/SConscript
index a781fe26ea7..fc89530fccc 100644
--- a/source4/ntvfs/posix/SConscript
+++ b/source4/ntvfs/posix/SConscript
@@ -1,6 +1,6 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('ntvfs_posix',
+hostenv.Library('ntvfs_posix',
 		['vfs_posix.c', 'pvfs_util.c', 'pvfs_search.c', 'pvfs_dirlist.c',
 		'pvfs_fileinfo.c', 'pvfs_unlink.c', 'pvfs_mkdir.c', 'pvfs_open.c',
 		'pvfs_read.c', 'pvfs_flush.c', 'pvfs_write.c', 'pvfs_fsinfo.c',
diff --git a/source4/ntvfs/unixuid/SConscript b/source4/ntvfs/unixuid/SConscript
index 7e1b304c3f0..d3134c3183a 100644
--- a/source4/ntvfs/unixuid/SConscript
+++ b/source4/ntvfs/unixuid/SConscript
@@ -1,3 +1,3 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('ntvfs_unixuid',['vfs_unixuid.c'])
+hostenv.Library('ntvfs_unixuid',['vfs_unixuid.c'])
diff --git a/source4/param/SConscript b/source4/param/SConscript
index 2b8eb89b300..b93cc342cd8 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')
diff --git a/source4/rpc_server/SConscript b/source4/rpc_server/SConscript
index 74caa8fd9e3..0ebc1a095c2 100644
--- a/source4/rpc_server/SConscript
+++ b/source4/rpc_server/SConscript
@@ -1,21 +1,21 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('rpcserver_common', 
+hostenv.Library('rpcserver_common', 
 		[ 'common/server_info.c', 'common/share_info.c'])
 
-#hostenv.StaticLibrary('rpcserver_dcom', [ 'dcom/oxidresolver.c','dcom/rot.c','dcom/rodb.c','dcom/remact.c', '../librpc/gen_ndr/ndr_dcom_d.c'])
+#hostenv.Library('rpcserver_dcom', [ 'dcom/oxidresolver.c','dcom/rot.c','dcom/rodb.c','dcom/remact.c', '../librpc/gen_ndr/ndr_dcom_d.c'])
 
-hostenv.StaticLibrary('rpcserver_echo', ['echo/rpc_echo.c'])
-hostenv.StaticLibrary('rpcserver_epmapper', ['epmapper/rpc_epmapper.c'])
-hostenv.StaticLibrary('rpcserver_remote', ['remote/dcesrv_remote.c'])
-hostenv.StaticLibrary('rpcserver_srvsvc', ['srvsvc/dcesrv_srvsvc.c'])
-hostenv.StaticLibrary('rpcserver_wkssvc', ['wkssvc/dcesrv_wkssvc.c'])
-hostenv.StaticLibrary('rpcserver_unixinfo', ['unixinfo/dcesrv_unixinfo.c'])
-hostenv.StaticLibrary('rpcserver_samr', ['samr/dcesrv_samr.c','samr/samr_password.c'])
-hostenv.StaticLibrary('rpcserver_winreg', [ 'winreg/rpc_winreg.c'])
-hostenv.StaticLibrary('rpcserver_netlogon', [ 'netlogon/dcerpc_netlogon.c'])
-hostenv.StaticLibrary('rpcserver_lsa', ['lsa/dcesrv_lsa.c'])
-hostenv.StaticLibrary('rpcserver_spoolss', ['spoolss/dcesrv_spoolss.c'])
-hostenv.StaticLibrary('rpcserver_drsuapi', ['drsuapi/dcesrv_drsuapi.c','drsuapi/drsuapi_cracknames.c'])
-hostenv.StaticLibrary('rpcserver_dssetup', ['dssetup/dcesrv_dssetup.c'])
-hostenv.StaticLibrary('rpcserver', ['dcerpc_server.c', 'dcerpc_sock.c', 'dcesrv_auth.c', 'handles.c'])
+hostenv.Library('rpcserver_echo', ['echo/rpc_echo.c'])
+hostenv.Library('rpcserver_epmapper', ['epmapper/rpc_epmapper.c'])
+hostenv.Library('rpcserver_remote', ['remote/dcesrv_remote.c'])
+hostenv.Library('rpcserver_srvsvc', ['srvsvc/dcesrv_srvsvc.c'])
+hostenv.Library('rpcserver_wkssvc', ['wkssvc/dcesrv_wkssvc.c'])
+hostenv.Library('rpcserver_unixinfo', ['unixinfo/dcesrv_unixinfo.c'])
+hostenv.Library('rpcserver_samr', ['samr/dcesrv_samr.c','samr/samr_password.c'])
+hostenv.Library('rpcserver_winreg', [ 'winreg/rpc_winreg.c'])
+hostenv.Library('rpcserver_netlogon', [ 'netlogon/dcerpc_netlogon.c'])
+hostenv.Library('rpcserver_lsa', ['lsa/dcesrv_lsa.c'])
+hostenv.Library('rpcserver_spoolss', ['spoolss/dcesrv_spoolss.c'])
+hostenv.Library('rpcserver_drsuapi', ['drsuapi/dcesrv_drsuapi.c','drsuapi/drsuapi_cracknames.c'])
+hostenv.Library('rpcserver_dssetup', ['dssetup/dcesrv_dssetup.c'])
+hostenv.Library('rpcserver', ['dcerpc_server.c', 'dcerpc_sock.c', 'dcesrv_auth.c', 'handles.c'])
diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
index 5ba45d8e77a..43a73a92a0e 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',
diff --git a/source4/smb_server/SConscript b/source4/smb_server/SConscript
index bedf4df15e6..6b3bb53264a 100644
--- a/source4/smb_server/SConscript
+++ b/source4/smb_server/SConscript
@@ -1,5 +1,5 @@
 Import('hostenv')
-hostenv.StaticLibrary('smb_server', 
+hostenv.Library('smb_server', 
 		['smb_server.c','conn.c','negprot.c','nttrans.c','session.c',
 		 'reply.c','request.c','search.c','service.c','sesssetup.c',
 		 'srvtime.c','trans2.c','signing.c','management.c'])
diff --git a/source4/smbd/SConscript b/source4/smbd/SConscript
index 55d0eb23be8..b3426a0073a 100644
--- a/source4/smbd/SConscript
+++ b/source4/smbd/SConscript
@@ -1,6 +1,6 @@
 Import('hostenv')
 
 service_files = ['service.c','service_stream.c','service_task.c']
-hostenv.StaticLibrary('server_service', service_files)
+hostenv.Library('server_service', service_files)
 hostenv.proto_headers += hostenv.CProtoHeader('proto.h', service_files)
 hostenv.Program('smbd',['server.c'])
diff --git a/source4/torture/SConscript b/source4/torture/SConscript
index b471dd40b61..48d2e14b5d0 100644
--- a/source4/torture/SConscript
+++ b/source4/torture/SConscript
@@ -1,22 +1,22 @@
 Import('hostenv')
-hostenv.StaticLibrary('torture_basic',
+hostenv.Library('torture_basic',
 	['basic/scanner.c','basic/utable.c','basic/charset.c',
 	 'basic/mangle_test.c','basic/denytest.c','basic/aliases.c',
 	 'basic/locking.c','basic/secleak.c','basic/rename.c','basic/dir.c',
 	 'basic/delete.c','basic/unlink.c','basic/disconnect.c',
 	 'basic/delaywrite.c','basic/attr.c','basic/properties.c'])
 
-hostenv.StaticLibrary('torture_raw',
+hostenv.Library('torture_raw',
 	[ 'raw/qfsinfo.c', 'raw/qfileinfo.c', 'raw/setfileinfo.c', 'raw/search.c',
 	'raw/close.c', 'raw/open.c', 'raw/mkdir.c', 'raw/oplock.c', 'raw/notify.c',
 	'raw/mux.c', 'raw/ioctl.c', 'raw/chkpath.c', 'raw/unlink.c', 'raw/read.c',
 	'raw/context.c', 'raw/write.c', 'raw/lock.c', 'raw/rename.c', 'raw/eas.c',
 	'raw/streams.c', 'raw/acls.c', 'raw/seek.c', 'raw/composite.c'])
 
-hostenv.StaticLibrary('torture_com',
+hostenv.Library('torture_com',
 	[ 'com/simple.c'])
 
-hostenv.StaticLibrary('torture_rpc',
+hostenv.Library('torture_rpc',
 	[ 'rpc/lsa.c', 'rpc/session_key.c', 'rpc/echo.c', 'rpc/dcom.c',
 	'rpc/dfs.c', 'rpc/drsuapi.c', 'rpc/spoolss.c', 'rpc/unixinfo.c',
 	'rpc/samr.c', 'rpc/wkssvc.c', 'rpc/srvsvc.c', 'rpc/svcctl.c', 'rpc/atsvc.c',
@@ -27,25 +27,25 @@ hostenv.StaticLibrary('torture_rpc',
 	'rpc/rot.c', 'rpc/bind.c', 'rpc/dssetup.c', 'rpc/alter_context.c',
 	'rpc/bench.c'])
 
-hostenv.StaticLibrary('torture_rap', [ 'rap/rap.c'] )
+hostenv.Library('torture_rap', [ 'rap/rap.c'] )
 
-hostenv.StaticLibrary('torture_auth', [ 'auth/ntlmssp.c', 'auth/pac.c' ])
+hostenv.Library('torture_auth', [ 'auth/ntlmssp.c', 'auth/pac.c' ])
 
-hostenv.StaticLibrary('torture_local', 
+hostenv.Library('torture_local', 
 	['local/iconv.c', 'lib/talloc/testsuite.c', 'local/messaging.c',
 	'local/binding_string.c', 'local/idtree.c', 'local/socket.c',
 	'local/irpc.c', 'local/resolve.c', 'local/util_strlist.c'])
 
-hostenv.StaticLibrary('torture_nbench', [ 'nbench/nbio.c', 'nbench/nbench.c' ])
+hostenv.Library('torture_nbench', [ 'nbench/nbio.c', 'nbench/nbench.c' ])
 
-hostenv.StaticLibrary('torture_ldap',
+hostenv.Library('torture_ldap',
 	[ 'ldap/common.c', 'ldap/basic.c', 'ldap/cldap.c', 'ldap/cldapbench.c' ])
 
-hostenv.StaticLibrary('torture_nbt',
+hostenv.Library('torture_nbt',
 	[ 'nbt/query.c', 'nbt/register.c', 'nbt/wins.c', 'nbt/winsbench.c',
 	'nbt/winsreplication.c', 'nbt/dgram.c'])
 
-hostenv.StaticLibrary('torture_net', 
+hostenv.Library('torture_net', 
 	[ 'libnet/userinfo.c', 'libnet/userman.c', 'libnet/domain.c',
 	'libnet/libnet_lookup.c', 'libnet/libnet_user.c', 'libnet/libnet_share.c',
 	'libnet/libnet_rpc.c'])
diff --git a/source4/web_server/SConscript b/source4/web_server/SConscript
index b3fa30e2677..212adc91272 100644
--- a/source4/web_server/SConscript
+++ b/source4/web_server/SConscript
@@ -1,3 +1,3 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('web_server',['web_server.c','http.c'])
+hostenv.Library('web_server',['web_server.c','http.c'])
diff --git a/source4/winbind/SConscript b/source4/winbind/SConscript
index d8a10bb4524..1d9abe0897f 100644
--- a/source4/winbind/SConscript
+++ b/source4/winbind/SConscript
@@ -1,7 +1,6 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('winbind',[
-			'wb_server.c',
+hostenv.Library('winbind',[ 'wb_server.c',
 			'wb_samba3_protocol.c'
 			'wb_samba3_cmd.c'
 			])