diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-21 16:32:38 +1100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-11-22 10:21:16 +0100 |
| commit | 8a2ef49dea36b103a87cf2aa63417737dd754ce6 (patch) | |
| tree | 97e5fd48481171e45542383215be1921fbcef3bc /source3/Makefile.in | |
| parent | ef195a18aac1f2b1ebfd34741d2242f659896549 (diff) | |
| download | samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.tar.gz samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.tar.bz2 samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.zip | |
build: Be consistent with the name of smbtorture binaries
This ensures that in both build systems, smbtorture3 is the source3 binary, and
smbtoture is our main smbtorture binary, built with waf.
Also included in this is the removal of bin/ndrdump4 as a special case.
This removes the last cases of binaries with different names in
each build system.
Andrew Bartlett
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index fe98579d1e..c533929f73 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -220,7 +220,7 @@ BIN_PROGS3 = bin/smbpasswd bin/rpcclient bin/smbcacls \ bin/profiles bin/ntlm_auth bin/sharesec \ bin/smbcquotas bin/eventlogadm -TORTURE_PROGS = bin/smbtorture bin/msgtest \ +TORTURE_PROGS = bin/smbtorture3 bin/msgtest \ bin/locktest2 bin/nsstest bin/vfstest \ $(TALLOCTORT) bin/replacetort \ $(TDBTORTURE) $(PTHREADPOOLTEST) \ @@ -1602,9 +1602,9 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@ gpext_modules:: $(GPEXT_MODULES) -torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE4@ +torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE@ -smbtorture : SHOWFLAGS bin/smbtorture +smbtorture3 : SHOWFLAGS bin/smbtorture3 masktest : SHOWFLAGS bin/masktest @@ -1955,7 +1955,7 @@ bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LI @$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) -bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ) +bin/smbtorture3: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ) @echo Linking $@ @$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \ @@ -3347,13 +3347,10 @@ libnetapi_examples: libnetapi clean_libnetapi_examples: $(MAKE) -C lib/netapi/examples clean -.PHONY: bin/smbtorture4 bin/ndrdump4 +.PHONY: bin/smbtorture -bin/smbtorture4: $(BINARY_PREREQS) - $(MAKE) -f Makefile-smbtorture4 bin/smbtorture4 - -bin/ndrdump4: $(BINARY_PREREQS) - $(MAKE) -f Makefile-smbtorture4 bin/ndrdump4 +bin/smbtorture: $(BINARY_PREREQS) + $(MAKE) -f Makefile-smbtorture bin/smbtorture .PHONY: vfs_examples |