summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-05-30 13:10:57 +0200
committerMichael Adam <obnox@samba.org>2012-05-31 06:36:55 +0200
commit15d567265e65e3d47579232a649d6d54f7b32d35 (patch)
treeed7496af6a1b94c660bb9af7aa2b95d052760598
parent769908540f047f24fcd3c57a90843abca85252b2 (diff)
downloadsamba-15d567265e65e3d47579232a649d6d54f7b32d35.tar.gz
samba-15d567265e65e3d47579232a649d6d54f7b32d35.tar.bz2
samba-15d567265e65e3d47579232a649d6d54f7b32d35.zip
build: rename build targets smbclient -> smbclient4 and smbclient3 -> smbclient
Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Thu May 31 06:36:55 CEST 2012 on sn-devel-104
-rw-r--r--selftest/wscript4
-rwxr-xr-xsource3/wscript_build2
-rw-r--r--source4/wscript_build2
3 files changed, 4 insertions, 4 deletions
diff --git a/selftest/wscript b/selftest/wscript
index 140cd6da92..ea37a62cc8 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -112,8 +112,8 @@ def cmd_testonly(opt):
binary_mapping = ('nmblookup3:nmblookup,' +
'nmblookup4:nmblookup4,' +
- 'smbclient3:smbclient3,' +
- 'smbclient4:smbclient,' +
+ 'smbclient3:smbclient,' +
+ 'smbclient4:smbclient4,' +
'smbtorture4:smbtorture,' +
'ntlm_auth3:ntlm_auth3')
diff --git a/source3/wscript_build b/source3/wscript_build
index 2edfee9c0c..a4a685848d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1217,7 +1217,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
''',
vars=locals())
-bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
+bld.SAMBA3_BINARY('client/smbclient',
source=CLIENT_SRC,
deps='''
talloc
diff --git a/source4/wscript_build b/source4/wscript_build
index 47f251e6e5..3996a12098 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-bld.SAMBA_BINARY('client/smbclient',
+bld.SAMBA_BINARY('client/smbclient' + bld.env.suffix4,
source='client/client.c',
deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options'
)