mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
s4-waf: remove the need for some of the lib aliases
This commit is contained in:
parent
eba9a54927
commit
026690af00
@ -4,7 +4,7 @@
|
||||
|
||||
bld.SAMBA_SUBSYSTEM('CHARSET',
|
||||
source='iconv.c charcnv.c util_unistr.c codepoints.c',
|
||||
public_deps='ICONV',
|
||||
public_deps='iconv',
|
||||
public_headers='charset.h',
|
||||
deps='DYNCONFIG'
|
||||
)
|
||||
|
@ -1,6 +1,6 @@
|
||||
bld.SAMBA_LIBRARY('LIBSAMBA-UTIL',
|
||||
source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c',
|
||||
public_deps='talloc LIBCRYPTO LIBREPLACE_NETWORK CHARSET EXECINFO UID_WRAPPER',
|
||||
public_deps='talloc LIBCRYPTO LIBREPLACE_NETWORK CHARSET execinfo UID_WRAPPER',
|
||||
public_headers='util.h dlinklist.h attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h util_ldb.h talloc_stack.h xfile.h',
|
||||
local_include=False,
|
||||
vnum='0.0.1'
|
||||
|
@ -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'
|
||||
)
|
||||
|
||||
|
||||
|
@ -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
|
||||
)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user