diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-12 20:12:07 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-18 16:12:07 +0200 |
| commit | 2fc342c20ab455a5961b1b2b507aa7b62ecabf1f (patch) | |
| tree | d0600e50491b1827481fb5cf30c7dbe5a0b6842f | |
| parent | d13fb8ddd0613f8704b2657e85ccb559706b3e13 (diff) | |
| download | samba-2fc342c20ab455a5961b1b2b507aa7b62ecabf1f.tar.gz samba-2fc342c20ab455a5961b1b2b507aa7b62ecabf1f.tar.bz2 samba-2fc342c20ab455a5961b1b2b507aa7b62ecabf1f.zip | |
waf-build: Add more libraries to avoid duplicate symbols
The new source of duplicates is calling libnetapi from inside smbtorture.
Andrew Bartlett
| -rw-r--r-- | libcli/cldap/wscript_build | 11 | ||||
| -rw-r--r-- | libcli/smb/wscript_build | 6 | ||||
| -rwxr-xr-x | source3/wscript_build | 9 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 5 |
4 files changed, 17 insertions, 14 deletions
diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build index d0c00d7f3b..9dd94c6691 100644 --- a/libcli/cldap/wscript_build +++ b/libcli/cldap/wscript_build @@ -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 + ) diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build index 36d9d1033a..0d74e261c2 100644 --- a/libcli/smb/wscript_build +++ b/libcli/smb/wscript_build @@ -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 ) - diff --git a/source3/wscript_build b/source3/wscript_build index 21e49ddd7c..fe02dfcd0c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -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, diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 46bca5aa0b..3d36925195 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -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') |