s4-waf: inline LIBREPLACE_NETWORK into 'replace'

metze

diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index 790b547749aacfbe88d3a2db3f68b1168076dc0c..f3ac7f0d00788b5d2753b04adcbb61ca828809a2 100644 (file)
--- 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 5457b175d1c363412f938c36e320be974e18ca7e..bfe9142669e1d2205624ca55be632a79731b39e0 100644 (file)
--- 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 34d382eb826b3a204d48f7f4d359d415d71c9593..5fa05f8c501b2c9315b6eb2057e6716d3a2ff43a 100644 (file)
--- 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 6e6dc8eeea531be51f7822298f788534574d59e7..debc7015dbfbae981e4a66953ed51ac1787c9ed3 100644 (file)
--- 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,

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 7f605dbbe290d65465c81d2c55db8e2068bf771b..d40be0bc6e996fd1ccafbc0ffcb8c0914b862ff9 100644 (file)
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -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'
        )
 
 

diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build
index 7ce9e65b12b09464764026f174d1d8c127a049ae..c2de5f49f88c0ff6ac2b054a7dbdc52cdea0f1d7 100644 (file)
--- a/source4/lib/socket/wscript_build
+++ b/source4/lib/socket/wscript_build
@@ -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
        )