s3: Work around dependency bug in Samba 4 waf build in merged build.

[kamenim/samba.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c6986edc2b1448e9c49857ca9e8fb374abb59918..1a4456dc2776810de8a8728c8c818cfc50bfaa95 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3217,13 +3217,14 @@ clean_libnetapi_examples:
 ../source4/configure: ../buildtools/scripts/configure.waf
        cd ../source4 && ./autogen.sh
 
-samba4-configure:
-       @$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure --prefix="$(prefix)" )
+samba4-configure: ../source4/configure
+       @$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure )
 
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-       cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture   
+       cd ../source4 && ../buildtools/bin/waf build --targets=asn1_compile,compile_et
+       cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture
        cp ../source4/bin/smbtorture bin/smbtorture4
 
 .PHONY: bin/smbtorture4