sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

s4-waf: inline LIBREPLACE_NETWORK into 'replace'

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2010-04-11 19:24:46 +02:00
parent b1393087ac
commit 33bb334e80
6 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/async_req/wscript_build
View File

@ -3,6 +3,6 @@
bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
source='async_sock.c',
public_deps='LIBREPLACE_NETWORK talloc tevent'
public_deps='talloc tevent'
)

21
lib/replace/wscript
View File

@ -311,10 +311,16 @@ def build(bld):
if bld.CONFIG_SET('REPLACE_GETPASS'): REPLACE_SOURCE += ' getpass.c'
if not bld.CONFIG_SET('HAVE_GETIFADDRS'): REPLACE_SOURCE += ' getifaddrs.c'
if not bld.CONFIG_SET('HAVE_DLOPEN'): REPLACE_SOURCE += ' dlfcn.c'
if not bld.CONFIG_SET('HAVE_SOCKETPAIR'): REPLACE_SOURCE += ' socketpair.c'
if not bld.CONFIG_SET('HAVE_CONNECT'): REPLACE_SOURCE += ' socket.c'
if not bld.CONFIG_SET('HAVE_GETIFADDRS'): REPLACE_SOURCE += ' getifaddrs.c'
if not bld.CONFIG_SET('HAVE_GETADDRINFO'): REPLACE_SOURCE += ' getaddrinfo.c'
if not bld.CONFIG_SET('HAVE_INET_NTOA'): REPLACE_SOURCE += ' inet_ntoa.c'
if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c'
if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c'
if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c'
bld.SAMBA_LIBRARY('replace',
source=REPLACE_SOURCE,
@ -330,19 +336,6 @@ def build(bld):
deps='replace',
install=False)
NET_SOURCES = []
if not bld.CONFIG_SET('HAVE_INET_NTOA'): NET_SOURCES.append('inet_ntoa.c')
if not bld.CONFIG_SET('HAVE_INET_ATON'): NET_SOURCES.append('inet_aton.c')
if not bld.CONFIG_SET('HAVE_INET_NTOP'): NET_SOURCES.append('inet_ntop.c')
if not bld.CONFIG_SET('HAVE_INET_PTON'): NET_SOURCES.append('inet_pton.c')
if not bld.CONFIG_SET('HAVE_SOCKETPAIR'): NET_SOURCES.append('socketpair.c')
if not bld.CONFIG_SET('HAVE_GETADDRINFO'):NET_SOURCES.append('getaddrinfo.c')
bld.SAMBA_SUBSYSTEM('LIBREPLACE_NETWORK', NET_SOURCES,
group='base_libraries',
deps='replace')
CRYPT_SOURCES = []
if not 'HAVE_CRYPT' in bld.env: CRYPT_SOURCES.append('crypt.c')

1
lib/tsocket/wscript_build
View File

@ -5,6 +5,5 @@ bld.SAMBA_SUBSYSTEM('LIBTSOCKET',
source='tsocket.c tsocket_helpers.c tsocket_bsd.c',
public_deps='talloc tevent',
public_headers='tsocket.h tsocket_internal.h',
deps='LIBREPLACE_NETWORK'
)

2
lib/util/wscript_build
View File

@ -2,7 +2,7 @@
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 tevent',
public_deps='talloc LIBCRYPTO CHARSET execinfo UID_WRAPPER tevent',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
local_include=False,

2
source4/heimdal_build/wscript_build
View File

@ -217,7 +217,7 @@ HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_H_SOURCE + '''
bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN',
HEIMDAL_ROKEN_SOURCE,
includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
deps='resolv LIBREPLACE_NETWORK UID_WRAPPER util'
deps='resolv UID_WRAPPER util'
)

6
source4/lib/socket/wscript_build
View File

@ -4,14 +4,14 @@
bld.SAMBA_SUBSYSTEM('LIBNETIF',
source='interface.c netif.c',
autoproto='netif_proto.h',
deps='LIBSAMBA-UTIL LIBREPLACE_NETWORK'
deps='LIBSAMBA-UTIL'
)
bld.SAMBA_MODULE('socket_ip',
source='socket_ip.c',
subsystem='samba_socket',
deps='LIBSAMBA-ERRORS LIBREPLACE_NETWORK',
deps='LIBSAMBA-ERRORS',
internal_module=True
)
@ -19,7 +19,7 @@ bld.SAMBA_MODULE('socket_ip',
bld.SAMBA_MODULE('socket_unix',
source='socket_unix.c',
subsystem='samba_socket',
deps='LIBREPLACE_NETWORK talloc',
deps='talloc',
internal_module=True
)