s3-waf: use common libcli/nbt build rules

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index a3c22dca07e0e37426adb83d71e0be34f6d2a1a5..7e3047079aacea854715ecc187cd3b79666b25fd 100644 (file)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -7,14 +7,13 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        )
 
 
-bld.SAMBA_LIBRARY('cli-nbt',
-       source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c',
-       public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util',
-       private_library=True
-       )
-
-
 if bld.env._SAMBA_BUILD_ == 4:
+    bld.SAMBA_LIBRARY('cli-nbt',
+                      source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c',
+                      public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util',
+                      private_library=True
+                      )
+
     bld.SAMBA_BINARY('nmblookup',
                      source='tools/nmblookup.c',
                      manpages='man/nmblookup.1',

diff --git a/source3/wscript_build b/source3/wscript_build
index 6c6e3813427e40a2030d7af507074ee8ce4d7d0e..a93dceb52de60b8864201f98dc208e07e715e34d 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1008,11 +1008,6 @@ bld.SAMBA3_SUBSYSTEM('ldb',
 bld.SAMBA3_SUBSYSTEM('errors3',
                      source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c')
 
-bld.SAMBA3_SUBSYSTEM('NDR_NBT_BUF',
-       source='../libcli/nbt/nbtname.c',
-       deps='talloc',
-       autoproto='nbtname.h')
-
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
                     deps='RPC_NDR_SAMR')
@@ -1366,6 +1361,7 @@ bld.RECURSE('../libcli/samsync')
 bld.RECURSE('../libcli/security')
 bld.RECURSE('../libcli/smb')
 bld.RECURSE('../libcli/smbreadline')
+bld.RECURSE('../libcli/nbt')
 bld.RECURSE('../lib/crypto')
 bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../lib/nss_wrapper')