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

diff --git a/selftest/wscript b/selftest/wscript
index 140cd6da92b635427012350752c3cc439d11d6ed..ea37a62cc84be4ca09fe5f7157411392c6332d8c 100644 (file)
--- 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 2edfee9c0cfa71ac3f205ce19234c0a143a1d3d9..a4a685848d21bfc0da40633d2691974859c27501 100755 (executable)
--- 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 47f251e6e569b033a95a73b58080984e1593946b..3996a12098ecb504b9637cb6be1356b6673c4d6c 100644 (file)
--- 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'
        )