s4: Rename LIBCLI_NBT -> cli_nbt.

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 8602282ed73e5d8868e2f490f4e230d3acef0bbc..ec2b4730331e90deb9028783a0826eae84117ed9 100644 (file)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -7,7 +7,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        )
 
 
-bld.SAMBA_LIBRARY('LIBCLI_NBT',
+bld.SAMBA_LIBRARY('cli_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
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('LIBCLI_NBT',
 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 cli_nbt popt POPT_SAMBA libnetif LIBCLI_RESOLVE'
        )
 
 
@@ -35,7 +35,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
 
 bld.SAMBA_PYTHON('python_netbios',
        source='pynbt.c',
-       public_deps='LIBCLI_NBT DYNCONFIG libsamba-hostconfig',
+       public_deps='cli_nbt DYNCONFIG libsamba-hostconfig',
        realname='samba/netbios.so'
        )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index de5d4323ff01f5c874912cd267f893c7fcb9bd89..bc7a1a9cbcc112f7555e2d45c095b299ccdd0e5f 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
        source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c dgram/browse.c',
-       public_deps='LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE'
+       public_deps='cli_nbt LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE'
        )
 
 
@@ -65,21 +65,21 @@ 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='cli_nbt libsamba-hostconfig libnetif'
        )
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
        source='finddcs_nbt.c finddcs_cldap.c',
        autoproto='finddcs_proto.h',
-       public_deps='LIBCLI_NBT MESSAGING RPC_NDR_IRPC LIBCLI_CLDAP'
+       public_deps='cli_nbt MESSAGING RPC_NDR_IRPC LIBCLI_CLDAP'
        )
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
        source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
        autoproto='libcli_proto.h',
-       public_deps='LIBCLI_RAW libsamba-errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT libsecurity LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+       public_deps='LIBCLI_RAW libsamba-errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli_nbt libsecurity LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
        )
 
 

diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index 9b540aa3716601d143efdda67c7da04e1c097893..a844cd58701d01648eb4ff2e000bddfa4459f88a 100644 (file)
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('ldb_wins_ldb',
 bld.SAMBA_SUBSYSTEM('NBTD_WINS',
        source='wins/winsserver.c wins/winsclient.c wins/winswack.c wins/wins_dns_proxy.c',
        autoproto='wins/winsserver_proto.h',
-       deps='LIBCLI_NBT WINSDB'
+       deps='cli_nbt WINSDB'
        )
 
 
@@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('NBTD_DGRAM',
 bld.SAMBA_SUBSYSTEM('NBT_SERVER',
        source='interfaces.c register.c query.c nodestatus.c defense.c packet.c irpc.c',
        autoproto='nbt_server_proto.h',
-       deps='LIBCLI_NBT NBTD_WINS NBTD_DGRAM'
+       deps='cli_nbt NBTD_WINS NBTD_DGRAM'
        )
 
 

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index a79d25c79b8eda18f20855838be155813834e85f..0b3e64bd7334280bd2f0f409e8bc3ee05b506a05 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -114,7 +114,7 @@ bld.SAMBA_MODULE('TORTURE_NBT',
        autoproto='nbt/proto.h',
        subsystem='smbtorture',
        init_function='torture_nbt_init',
-       deps='LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc',
+       deps='LIBCLI_SMB cli_nbt LIBCLI_DGRAM LIBCLI_WREPL torture_rpc',
        internal_module=True
        )