From 15b7f87894cf1ddf9d9061d90767135f1ffe31b2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 5 Feb 2011 09:54:40 +0100
Subject: [PATCH] s3:Makefile.in: use waf directly to build smbtorture4 and
 ndrdump4

metze
---
 source3/Makefile.in | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ebfee9fbc9b2..6d5a3faf9d5d 100644
--- 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
-- 
2.34.1