From 2fc342c20ab455a5961b1b2b507aa7b62ecabf1f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 12 May 2011 20:12:07 +0200 Subject: waf-build: Add more libraries to avoid duplicate symbols The new source of duplicates is calling libnetapi from inside smbtorture. Andrew Bartlett --- libcli/cldap/wscript_build | 11 ++++++----- libcli/smb/wscript_build | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'libcli') 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 ) - -- cgit