s4: Rename LIBNETIF to libnetif.

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 48afffbefa5c27acf91c3b26cd6cbb42831b2426..a39f83564521eb82196843760a4d0ea6bcdbe0ef 100644 (file)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -2,22 +2,22 @@
 
 bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        source='nbtname.c',
-        deps='talloc',
+       deps='talloc',
        autoproto='nbtname.h'
        )
 
 
 bld.SAMBA_LIBRARY('LIBCLI_NBT',
-                  source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c',
-                  public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket LIBSAMBA-UTIL',
-                  private_library=True
-                  )
+       source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c',
+       public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket LIBSAMBA-UTIL',
+       private_library=True
+       )
 
 
 bld.SAMBA_BINARY('nmblookup',
        source='tools/nmblookup.c',
        manpages='man/nmblookup.1',
-       deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA LIBNETIF LIBCLI_RESOLVE'
+       deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA libnetif LIBCLI_RESOLVE'
        )
 
 

diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build
index 85a9798ffa578daea9f6e48659c6358197748b11..fbf3c7e1283a84d5bb9965ba672a7264bb21ae6a 100644 (file)
--- a/source4/cldap_server/wscript_build
+++ b/source4/cldap_server/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('service_cldap',
        source='cldap_server.c',
        subsystem='service',
        init_function='server_service_cldapd_init',
-       deps='CLDAPD process_model LIBNETIF'
+       deps='CLDAPD process_model libnetif'
        )
 
 

diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build
index 0c4fd7e1e20d7622e85677124896747b7b9e3cce..6aa04811154c6ee59d908e51e1ac3f501c7c218a 100644 (file)
--- a/source4/lib/socket/wscript_build
+++ b/source4/lib/socket/wscript_build
@@ -1,33 +1,29 @@
 #!/usr/bin/env python
 
-
-bld.SAMBA_LIBRARY('LIBNETIF',
-                  source='interface.c netif.c',
-                  autoproto='netif_proto.h',
-                  deps='LIBSAMBA-UTIL',
-                  private_library=True
-                  )
-
+bld.SAMBA_LIBRARY('libnetif',
+    source='interface.c netif.c',
+    autoproto='netif_proto.h',
+    deps='LIBSAMBA-UTIL',
+    private_library=True
+    )
 
 bld.SAMBA_MODULE('socket_ip',
-       source='socket_ip.c',
-       subsystem='samba_socket',
-       deps='LIBSAMBA-ERRORS',
-       internal_module=True
-       )
-
+    source='socket_ip.c',
+    subsystem='samba_socket',
+    deps='LIBSAMBA-ERRORS',
+    internal_module=True
+    )
 
 bld.SAMBA_MODULE('socket_unix',
-       source='socket_unix.c',
-       subsystem='samba_socket',
-       deps='talloc',
-       internal_module=True
-       )
-
+    source='socket_unix.c',
+    subsystem='samba_socket',
+    deps='talloc',
+    internal_module=True
+    )
 
 bld.SAMBA_SUBSYSTEM('samba_socket',
-       source='socket.c access.c connect_multi.c connect.c',
-       public_deps='talloc LIBTSOCKET',
-       deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE socket_ip socket_unix'
-       )
+    source='socket.c access.c connect_multi.c connect.c',
+    public_deps='talloc LIBTSOCKET',
+    deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE socket_ip socket_unix'
+    )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 0acf8053ba37a3ca8e98bc499aac10615ad82d8f..d8f7c524173c378917b7c13c449a6562b709badf 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -65,7 +65,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE',
 bld.SAMBA_SUBSYSTEM('LP_RESOLVE',
        source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/file.c resolve/host.c resolve/resolve_lp.c',
        autoproto='resolve/lp_proto.h',
-       deps='LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF'
+       deps='LIBCLI_NBT LIBSAMBA-HOSTCONFIG libnetif'
        )
 
 

diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index af77abe9f1050635143046598bea1ee6fb5b45fc..286dbf36022b91e3662d0a496de0e5263e3552b8 100644 (file)
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_MODULE('ldb_wins_ldb',
        source='wins/wins_ldb.c',
        subsystem='ldb',
        init_function='LDB_MODULE(wins_ldb)',
-       deps='ldb LIBNETIF LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL',
+       deps='ldb libnetif LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL',
        internal_module=False,
        )
 

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 13615abc0b1570ec68650aaa708208c13c4bb1d3..638aed5fc640c3bd5d55de01b4ef25c434d83e07 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -1,41 +1,41 @@
 #!/usr/bin/env python
 
 bld.SAMBA_LIBRARY('samba_python',
-                  source=[],
-                  deps='LIBPYTHON PYTALLOC pyrpc_util',
-                  grouping_library=True,
-                  private_library=True,
-                  pyext=True)
+       source=[],
+       deps='LIBPYTHON PYTALLOC pyrpc_util',
+       grouping_library=True,
+       private_library=True,
+       pyext=True)
 
 bld.SAMBA_SUBSYSTEM('LIBPYTHON',
-               source='modules.c',
-               public_deps='EXT_LIB_PYTHON',
-               init_function_sentinal='{NULL,NULL}',
-               deps='talloc',
-               pyext=True,
-               )
+       source='modules.c',
+       public_deps='EXT_LIB_PYTHON',
+       init_function_sentinal='{NULL,NULL}',
+       deps='talloc',
+       pyext=True,
+       )
 
 
 bld.SAMBA_SUBSYSTEM('PYTALLOC',
-               source='../../../lib/talloc/pytalloc.c',
-               public_deps='EXT_LIB_PYTHON talloc',
-               pyext=True,
-               )
+       source='../../../lib/talloc/pytalloc.c',
+       public_deps='EXT_LIB_PYTHON talloc',
+       pyext=True,
+       )
 
 
 bld.SAMBA_PYTHON('python_uuid',
-               source='uuidmodule.c',
-               deps='LIBNDR',
-               realname='uuid.so',
-               enabled = float(bld.env.PYTHON_VERSION) <= 2.4
-               )
+       source='uuidmodule.c',
+       deps='LIBNDR',
+       realname='uuid.so',
+       enabled = float(bld.env.PYTHON_VERSION) <= 2.4
+       )
 
 
 bld.SAMBA_PYTHON('python_glue',
-               source='pyglue.c',
-               deps='pyparam_util LIBSAMBA-UTIL LIBNETIF PYTALLOC',
-               realname='samba/_glue.so'
-               )
+       source='pyglue.c',
+       deps='pyparam_util LIBSAMBA-UTIL libnetif PYTALLOC',
+       realname='samba/_glue.so'
+       )
 
 
 # create a dummy subsystem for EXT_LIB_PYTHON