sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

waf-build: Add more libraries to avoid duplicate symbols

Browse Source 
The new source of duplicates is calling libnetapi from inside smbtorture.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-05-12 20:12:07 +02:00
parent d13fb8ddd0
commit 2fc342c20a
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcli/cldap/wscript_build
View 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
)

6
libcli/smb/wscript_build
View 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
)

9
source3/wscript_build
View File

@ -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,

5
source4/libcli/wscript_build
View 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')