summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-05-30 13:09:57 +0200
committerMichael Adam <obnox@samba.org>2012-05-31 04:46:06 +0200
commit52e1bba86164235ecaff7a6c9c5c2101fa06e863 (patch)
tree3e32659e59d0609fab46a6bec91acc704ddeef96
parent0659a708e7cd3d4692f6585b20fcfe8f93b524e1 (diff)
downloadsamba-52e1bba86164235ecaff7a6c9c5c2101fa06e863.tar.gz
samba-52e1bba86164235ecaff7a6c9c5c2101fa06e863.tar.bz2
samba-52e1bba86164235ecaff7a6c9c5c2101fa06e863.zip
build: rename build targets nmblookup -> nmblookup4 and nmblookup3 -> nmblookup
-rwxr-xr-xlibcli/nbt/wscript_build2
-rw-r--r--selftest/wscript4
-rwxr-xr-xsource3/wscript_build2
3 files changed, 4 insertions, 4 deletions
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index faf818ef53..f67ba91598 100755
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('cli-nbt',
private_library=True
)
-bld.SAMBA_BINARY('nmblookup',
+bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
source='tools/nmblookup.c',
manpages='man/nmblookup.1',
deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE'
diff --git a/selftest/wscript b/selftest/wscript
index 494f5d8322..563edfb524 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -110,8 +110,8 @@ def cmd_testonly(opt):
if o[0:1] != '_':
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
- binary_mapping = ('nmblookup3:nmblookup3,' +
- 'nmblookup4:nmblookup,' +
+ binary_mapping = ('nmblookup3:nmblookup,' +
+ 'nmblookup4:nmblookup4,' +
'smbclient3:smbclient3,' +
'smbtorture4:smbtorture,' +
'ntlm_auth3:ntlm_auth3')
diff --git a/source3/wscript_build b/source3/wscript_build
index 02049e29ad..2edfee9c0c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1364,7 +1364,7 @@ bld.SAMBA3_BINARY('smbget',
smbclient''',
vars=locals())
-bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
+bld.SAMBA3_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
deps='''
talloc