diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-08 11:19:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-08 04:52:03 +0200 |
| commit | 078db8f6c9580e215d850d26e8a9942aa757e245 (patch) | |
| tree | 9308bf801853f97fe51bf22e5ec99bef0695db34 | |
| parent | 820fe8acca1454b43bc5454f56cf848d6250bc4c (diff) | |
| download | samba-078db8f6c9580e215d850d26e8a9942aa757e245.tar.gz samba-078db8f6c9580e215d850d26e8a9942aa757e245.tar.bz2 samba-078db8f6c9580e215d850d26e8a9942aa757e245.zip | |
build: build wbinfo only once in the waf build
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sat Oct 8 04:52:03 CEST 2011 on sn-devel-104
| -rw-r--r-- | nsswitch/wbinfo.c | 3 | ||||
| -rw-r--r-- | nsswitch/wscript_build | 5 | ||||
| -rwxr-xr-x | source3/wscript_build | 9 | ||||
| -rw-r--r-- | source4/winbind/wscript_build | 4 |
4 files changed, 7 insertions, 14 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index 6459b8e4c2..e7f902f08b 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -22,13 +22,14 @@ */ #include "includes.h" -#include "popt_common.h" #include "winbind_client.h" #include "libwbclient/wbclient.h" #include "lib/popt/popt.h" #include "../libcli/auth/libcli_auth.h" #if (_SAMBA_BUILD_) >= 4 #include "lib/cmdline/popt_common.h" +#else +#include "popt_common.h" #endif #ifdef DBGC_CLASS diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build index 4e353d3bd3..f740fdf25f 100644 --- a/nsswitch/wscript_build +++ b/nsswitch/wscript_build @@ -40,3 +40,8 @@ bld.SAMBA_SUBSYSTEM('WB_REQTRANS', source='wb_reqtrans.c', deps='talloc tevent LIBASYNC_REQ' ) + +bld.SAMBA_BINARY('wbinfo', + source='wbinfo.c', + deps='samba-util LIBCLI_AUTH popt POPT_SAMBA wbclient LIBAFS_SETTOKEN' + ) diff --git a/source3/wscript_build b/source3/wscript_build index 2e54195ff0..78b24746b3 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -606,8 +606,6 @@ SMBFILTER_SRC = '''utils/smbfilter.c''' WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c''' -WBINFO_SRC = '''../nsswitch/wbinfo.c''' - NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''' NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}''' @@ -1338,13 +1336,6 @@ bld.SAMBA3_BINARY('versiontest', deps='SAMBA_VERSION samba3core param', vars=locals()) -bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3, - source=WBINFO_SRC, - deps='''talloc wbclient tevent cap - asn1util LIBTSOCKET pdb ldap param smbd_shim - LIBNTLMSSP popt_samba3 LIBAFS_SETTOKEN''', - vars=locals()) - bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, source=NTLM_AUTH_SRC, deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build index 8bf5d766e0..5ba9c2ae0f 100644 --- a/source4/winbind/wscript_build +++ b/source4/winbind/wscript_build @@ -24,7 +24,3 @@ bld.SAMBA_SUBSYSTEM('IDMAP', public_deps='samdb-common ldbsamba' ) -bld.SAMBA_BINARY('wbinfo', - source='../../nsswitch/wbinfo.c', - deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent tevent-util LIBASYNC_REQ security ndr NDR_SECURITY' - ) |