From 8a2ef49dea36b103a87cf2aa63417737dd754ce6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 21 Nov 2012 16:32:38 +1100 Subject: 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 --- source3/Makefile-smbtorture | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 source3/Makefile-smbtorture (limited to 'source3/Makefile-smbtorture') diff --git a/source3/Makefile-smbtorture b/source3/Makefile-smbtorture new file mode 100644 index 0000000000..4b5b143cfe --- /dev/null +++ b/source3/Makefile-smbtorture @@ -0,0 +1,24 @@ +WAF_BINARY=buildtools/bin/waf +WAF=$(WAF_BINARY) +WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) +SAMBA4_BINARIES="smbtorture" + +samba4-configure: + @(cd .. && \ + CFLAGS='' $(WAF) reconfigure || \ + CFLAGS='' $(WAF) configure --enable-selftest --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-debug) + +.PHONY: samba4-configure + +bin/smbtorture: $(BINARY_PREREQS) samba4-configure samba4-config-compare + cd .. && $(WAF_BUILD) --targets=smbtorture + cp ../bin/smbtorture bin/smbtorture + +.PHONY: bin/smbtorture + +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 -- cgit