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

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

1 files changed, 17 insertions, 17 deletions

diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript
index 76143b97cf..aa911d9838 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')