diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-11 19:24:46 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-04-12 09:13:43 +0200 |
| commit | 33bb334e8030749cb675353df882730e3119ee9c (patch) | |
| tree | 9fffeb702dc4bc5589713348aac47c46de90ff04 /lib | |
| parent | b1393087ace8289a13e09e5246ac0efec560e959 (diff) | |
| download | samba-33bb334e8030749cb675353df882730e3119ee9c.tar.gz samba-33bb334e8030749cb675353df882730e3119ee9c.tar.bz2 samba-33bb334e8030749cb675353df882730e3119ee9c.zip | |
s4-waf: inline LIBREPLACE_NETWORK into 'replace'
metze
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/async_req/wscript_build | 2 | ||||
| -rw-r--r-- | lib/replace/wscript | 21 | ||||
| -rw-r--r-- | lib/tsocket/wscript_build | 1 | ||||
| -rw-r--r-- | lib/util/wscript_build | 2 |
4 files changed, 9 insertions, 17 deletions
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build index 790b547749..f3ac7f0d00 100644 --- a/lib/async_req/wscript_build +++ b/lib/async_req/wscript_build @@ -3,6 +3,6 @@ bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ', source='async_sock.c', - public_deps='LIBREPLACE_NETWORK talloc tevent' + public_deps='talloc tevent' ) diff --git a/lib/replace/wscript b/lib/replace/wscript index 5457b175d1..bfe9142669 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -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') diff --git a/lib/tsocket/wscript_build b/lib/tsocket/wscript_build index 34d382eb82..5fa05f8c50 100644 --- a/lib/tsocket/wscript_build +++ b/lib/tsocket/wscript_build @@ -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' ) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 6e6dc8eeea..debc7015db 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -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, |