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-smbtorture4 | |
| 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-smbtorture4')
| -rw-r--r-- | source3/Makefile-smbtorture4 | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4 deleted file mode 100644 index dbc0e6dd46..0000000000 --- a/source3/Makefile-smbtorture4 +++ /dev/null @@ -1,30 +0,0 @@ -WAF_BINARY=buildtools/bin/waf -WAF=$(WAF_BINARY) -WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) -SAMBA4_BINARIES="smbtorture,ndrdump" - -samba4-configure: - @(cd .. && \ - CFLAGS='' $(WAF) reconfigure || \ - CFLAGS='' $(WAF) configure --enable-selftest --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-debug) - -.PHONY: samba4-configure - -bin/smbtorture4: $(BINARY_PREREQS) samba4-configure samba4-config-compare - cd .. && $(WAF_BUILD) --targets=smbtorture - cp ../bin/smbtorture bin/smbtorture4 - -.PHONY: bin/smbtorture4 - -bin/ndrdump4: $(BINARY_PREREQS) samba4-configure - cd .. && $(WAF_BUILD) --targets=ndrdump - cp ../bin/ndrdump bin/ndrdump4 - -.PHONY: bin/ndrdump4 - -samba4-config-compare: samba4-configure - @echo "Comparing config.h from autoconf and waf" - @echo "Configure results missing from WAF are:" - ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h - @echo "Configure results additionaly found by WAF are:" - DIFF="comm -13" ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h |