s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sat Feb  5 11:53:05 CET 2011 on sn-devel-104

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ebfee9fbc9b2ab14b09d67a6a3669b1bb77d0449..8e36b575ba890a74d050c9554ba84870cd0d9ece 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3474,21 +3474,24 @@ libnetapi_examples: libnetapi
 clean_libnetapi_examples:
        $(MAKE) -C lib/netapi/examples clean
 
-../source4/configure: ../buildtools/scripts/configure.waf
-       cd ../source4 && ./autogen.sh
+WAF_BINARY=../buildtools/bin/waf
+WAF=$(WAF_BINARY)
+WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
+SAMBA4_BINARIES="smbtorture,ndrdump"
 
-samba4-configure: ../source4/configure
-       @CFLAGS='' $(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
-               CFLAGS='' ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
+samba4-configure:
+       @(cd ../source4 && \
+               CFLAGS='' $(WAF) reconfigure || \
+               CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
 
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-       cd ../source4 && $(MAKE) bin/smbtorture
+       cd ../source4 && $(WAF_BUILD) --targets=smbtorture
        cp ../source4/bin/smbtorture bin/smbtorture4
 
 bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
-       cd ../source4 && $(MAKE) bin/ndrdump
+       cd ../source4 && $(WAF_BUILD) --targets=ndrdump
        cp ../source4/bin/ndrdump bin/ndrdump4
 
 .PHONY: bin/smbtorture4