diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-01 12:45:38 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-07 17:42:03 +1100 |
| commit | 055f017b3693af95864f6595cf4ead041c389c52 (patch) | |
| tree | 9e59e56dc7dc3345722bf678027db66a75eb1062 /libcli | |
| parent | 83f0dc44a70ed7e49bcee3718ff17b2063b2a01e (diff) | |
| download | samba-055f017b3693af95864f6595cf4ead041c389c52.tar.gz samba-055f017b3693af95864f6595cf4ead041c389c52.tar.bz2 samba-055f017b3693af95864f6595cf4ead041c389c52.zip | |
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
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/nbt/wscript_build | 31 | ||||
| -rw-r--r-- | libcli/security/wscript_build | 11 |
2 files changed, 20 insertions, 22 deletions
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' + ) diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build index 940ee700f2..f3b654e983 100644 --- a/libcli/security/wscript_build +++ b/libcli/security/wscript_build @@ -7,9 +7,8 @@ bld.SAMBA_LIBRARY('security', deps='talloc ndr NDR_SECURITY' ) -if getattr(bld.env, '_SAMBA_BUILD_', 0) == 4: - bld.SAMBA_PYTHON('pysecurity', - source='pysecurity.c', - deps='security pytalloc-util', - realname='samba/security.so' - ) +bld.SAMBA_PYTHON('pysecurity', + source='pysecurity.c', + deps='security pytalloc-util', + realname='samba/security.so' + ) |