From 026690af0076d84947ea60a3a20d0bba972e67db Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 24 Mar 2010 22:29:12 +1100 Subject: s4-waf: remove the need for some of the lib aliases --- source4/auth/ntlm/wscript_build | 2 +- source4/torture/local/wscript_build | 2 +- source4/wscript_build | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'source4') diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index dde33c6077..4fd12cbbb9 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -40,7 +40,7 @@ bld.SAMBA_MODULE('auth_unix', source='auth_unix.c', subsystem='auth', init_function='auth_unix_init', - deps='CRYPT PAM PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET' + deps='crypt pam PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET' ) diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index 785101ed79..0047cfaac3 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -3,6 +3,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL', autoproto='proto.h', subsystem='smbtorture', init_function='torture_local_init', - deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING ICONV POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB SOCKET_WRAPPER', + deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB SOCKET_WRAPPER', internal_module=True ) diff --git a/source4/wscript_build b/source4/wscript_build index b5f80e2bcd..79e07deb06 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -14,15 +14,11 @@ bld.SAMBA_MKVERSION('version.h') # we don't always use consistent names for our subsystems. # this sets up some aliases bld.TARGET_ALIAS('attr', 'XATTR') -bld.TARGET_ALIAS('execinfo', 'EXECINFO') bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT') bld.TARGET_ALIAS('z', 'ZLIB') -bld.TARGET_ALIAS('pam', 'PAM') bld.TARGET_ALIAS('sasl2', 'SASL') -bld.TARGET_ALIAS('crypt', 'CRYPT') bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC') bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt') -bld.TARGET_ALIAS('iconv', 'ICONV') # missing subsystems - need looking at bld.SAMBA_SUBSYSTEM('INTL', '') # external gettext library -- cgit