summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-21 10:14:54 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-22 02:51:09 +0100
commit9aa85b6e30a226cf7f1d811d2c7742d2eb308417 (patch)
treea79e523815ee0afe98b7f0e09b3c1f59317ca4ca
parentb59aa0826151b2f45947f49f0998155100bcef9d (diff)
downloadsamba-9aa85b6e30a226cf7f1d811d2c7742d2eb308417.tar.gz
samba-9aa85b6e30a226cf7f1d811d2c7742d2eb308417.tar.bz2
samba-9aa85b6e30a226cf7f1d811d2c7742d2eb308417.zip
s3-waf: use common libcli/nbt build rules
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--libcli/nbt/wscript_build13
-rw-r--r--source3/wscript_build6
2 files changed, 7 insertions, 12 deletions
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index a3c22dca07..7e3047079a 100644
--- 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 6c6e381342..a93dceb52d 100644
--- 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')