From 055f017b3693af95864f6595cf4ead041c389c52 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 1 Sep 2011 12:45:38 +1000 Subject: build: Reduce build systems to just top level waf and autoconf The s3-waf build system is a key component of the top level build, but with this commit is is no longer available directly. This reduces the number of build system combinations in master as we prepare for the Samba 4.0 release. Andrew Bartlett --- libcli/nbt/wscript_build | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'libcli/nbt') diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index 2c70a1d775..b531dba469 100644 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -11,22 +11,21 @@ bld.SAMBA_SUBSYSTEM('lmhosts', deps='replace talloc' ) -if bld.env._SAMBA_BUILD_ == 4: - bld.SAMBA_LIBRARY('cli-nbt', - source='nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c', - public_deps='ndr NDR_NBT tevent tevent-util NDR_SECURITY samba_socket samba-util lmhosts', - private_library=True - ) +bld.SAMBA_LIBRARY('cli-nbt', + source='nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c', + public_deps='ndr NDR_NBT tevent tevent-util NDR_SECURITY samba_socket samba-util lmhosts', + private_library=True + ) - bld.SAMBA_BINARY('nmblookup', - source='tools/nmblookup.c', - manpages='man/nmblookup.1', - deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE' - ) +bld.SAMBA_BINARY('nmblookup', + source='tools/nmblookup.c', + manpages='man/nmblookup.1', + deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE' + ) - bld.SAMBA_PYTHON('python_netbios', - source='pynbt.c', - public_deps='cli-nbt DYNCONFIG samba-hostconfig', - realname='samba/netbios.so' - ) +bld.SAMBA_PYTHON('python_netbios', + source='pynbt.c', + public_deps='cli-nbt DYNCONFIG samba-hostconfig', + realname='samba/netbios.so' + ) -- cgit