summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-21 11:12:22 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-22 02:51:09 +0100
commit21f81703ca45c105442957b88852c5edb438b8da (patch)
tree42662a657d04ea5f66ca46239b83f3046f560245
parent5fc565feacf21b5b4d221258be1bbccbd6e162e9 (diff)
downloadsamba-21f81703ca45c105442957b88852c5edb438b8da.tar.gz
samba-21f81703ca45c105442957b88852c5edb438b8da.tar.bz2
samba-21f81703ca45c105442957b88852c5edb438b8da.zip
s3-waf: use bld.env.suffix3 for differentiating toplevel build
this uses bld.env.suffix3 to mean "3" for a toplevel build, and blank otherwise. This allows us to change the overlapping binaries to have a '3' suffix Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/wscript_build15
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 1e09be00d1..6e195adbd2 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -692,6 +692,7 @@ if not bld.env.toplevel_build:
bld.SAMBA_MKVERSION('include/version.h')
bld.RECURSE('../lib/replace')
bld.RECURSE('build')
+ bld.env.suffix3 = ''
######################## SUBSYSTEMS #################################
@@ -1166,7 +1167,7 @@ bld.SAMBA3_BINARY('smbtree',
RPC_NDR_SRVSVC''',
vars=locals())
-bld.SAMBA3_BINARY('smbpasswd',
+bld.SAMBA3_BINARY('smbpasswd' + bld.env.suffix3,
source=SMBPASSWD_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL
@@ -1185,12 +1186,12 @@ bld.SAMBA3_BINARY('smbget',
deps='''talloc tdb libsmb/smbclient POPT_SAMBA3''',
vars=locals())
-bld.SAMBA3_BINARY('nmblookup',
+bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
source=NMBLOOKUP_SRC,
deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR LIBNMB''',
vars=locals())
-bld.SAMBA3_BINARY('smbtorture',
+bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source=SMBTORTURE_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
LIB_NONSMBD POPT_SAMBA3 ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
@@ -1201,7 +1202,7 @@ bld.SAMBA3_BINARY('smbconftort',
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''',
vars=locals())
-bld.SAMBA3_BINARY('masktest',
+bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
source=MASKTEST_SRC,
deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
@@ -1237,7 +1238,7 @@ bld.SAMBA3_BINARY('sharesec',
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''',
vars=locals())
-bld.SAMBA3_BINARY('locktest',
+bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
source=LOCKTEST_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
@@ -1286,14 +1287,14 @@ bld.SAMBA3_BINARY('versiontest',
deps='SAMBA_VERSION',
vars=locals())
-bld.SAMBA3_BINARY('wbinfo',
+bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
LIBSAMBA POPT_SAMBA3 LIBAFS_SETTOKEN''',
vars=locals())
-bld.SAMBA3_BINARY('ntlm_auth',
+bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA3 ASN1_UTIL LIBTSOCKET