waf-build: Add more libraries to avoid duplicate symbols
authorAndrew Bartlett <abartlet@samba.org>
Thu, 12 May 2011 18:12:07 +0000 (20:12 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 18 May 2011 14:12:07 +0000 (16:12 +0200)
The new source of duplicates is calling libnetapi from inside smbtorture.

Andrew Bartlett

libcli/cldap/wscript_build
libcli/smb/wscript_build
source3/wscript_build
source4/libcli/wscript_build

index d0c00d7f3b000e4fb863494c1f3952ad6091fcc3..9dd94c6691008b7b16f5d8cbce8f2e61b4a8224d 100644 (file)
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_CLDAP',
-       source='cldap.c',
-       public_deps='cli-ldap',
-       deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON'
-       )
+bld.SAMBA_LIBRARY('LIBCLI_CLDAP',
+                  source='cldap.c',
+                  public_deps='cli-ldap',
+                  deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON',
+                  private_library=True
+                  )
 
index 36d9d1033a07253b0c6666f736a216c6a3dd5637..0d74e261c28066629f4f2ee00207a058c6936d9c 100644 (file)
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMMON',
+bld.SAMBA_LIBRARY('LIBCLI_SMB_COMMON',
        source='smb2_create_blob.c util.c',
        autoproto='smb_common_proto.h',
-       public_deps='talloc'
+       public_deps='talloc samba-util',
+                  private_library=True
        )
-
index 21e49ddd7c5f0fa0aceab6a2142502e45ef11d39..fe02dfcd0cd8c02f877d633eb7907b2202d9291a 100755 (executable)
@@ -797,10 +797,11 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
                     deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON',
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('LIBSMB',
-                    source=LIBSMB_SRC,
-                    deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON',
-                    vars=locals())
+bld.SAMBA3_LIBRARY('LIBSMB',
+                   source=LIBSMB_SRC,
+                   deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON',
+                   vars=locals(),
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
                     source=DRSUAPI_SRC,
index 46bca5aa0b2415cb59472b80bf4039cecf2c2516..3d369251953db53cdc04e5e2695b8237546cdd7e 100644 (file)
@@ -83,11 +83,12 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
        )
 
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_RAW',
+bld.SAMBA_LIBRARY('LIBCLI_RAW',
        source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
        autoproto='raw/raw_proto.h',
        public_deps='samba_socket LIBPACKET LIBCRYPTO',
-       deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE security ndr samba-util errors CHARSET talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF LIBCLI_SMB_COMMON'
+       deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE security ndr samba-util errors CHARSET talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF LIBCLI_SMB_COMMON',
+                  private_library=True
        )
 
 bld.RECURSE('smb2')