s4-waf: inline LIBREPLACE_NETWORK into 'replace'

[samba.git] / source4 / heimdal_build / wscript_build

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f095ff7b61ed451183d83f361a844ef64fc7bc01..d40be0bc6e996fd1ccafbc0ffcb8c0914b862ff9 100644 (file)
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -180,10 +180,8 @@ HEIMDAL_ROKEN_H_SOURCE = '''
        ../heimdal/lib/roken/issuid.c
        ../heimdal/lib/roken/net_read.c
        ../heimdal/lib/roken/net_write.c
-       ../heimdal/lib/roken/socket.c
        ../heimdal/lib/roken/parse_time.c
        ../heimdal/lib/roken/parse_units.c
-       ../heimdal/lib/roken/roken_gethostby.c
        ../heimdal/lib/roken/signal.c
        ../heimdal/lib/roken/vis.c
        ../heimdal/lib/roken/strlwr.c
@@ -203,7 +201,8 @@ HEIMDAL_ROKEN_H_SOURCE = '''
 
 if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
        HEIMDAL_ROKEN_H_SOURCE += '''
-               ../heimdal/lib/roken/getprogname.c ../heimdal/lib/roken/setprogname.c
+               ../heimdal/lib/roken/getprogname.c
+               ../heimdal/lib/roken/setprogname.c
        '''
 
 if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
@@ -211,12 +210,14 @@ if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
 
 HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_H_SOURCE + '''
        ../heimdal/lib/roken/resolve.c
+       ../heimdal/lib/roken/socket.c
+       ../heimdal/lib/roken/roken_gethostby.c
 '''
 
 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'
        )
 
 
@@ -417,7 +418,7 @@ bld.SAMBA_BINARY('asn1_compile',
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         includes='../heimdal/lib/asn1 ../heimdal/lib/roken',
         group='build_compilers',
-       deps='HEIMDAL_ROKEN_H replace',
+       deps='HEIMDAL_ROKEN_H LIBREPLACE_H',
         install=False
        )
 
@@ -428,7 +429,7 @@ bld.SAMBA_BINARY('compile_et',
        includes='../heimdal/lib/com_err',
         group='build_compilers',
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
-       deps='HEIMDAL_ROKEN_H replace',
+       deps='HEIMDAL_ROKEN_H LIBREPLACE_H',
         install=False
        )