summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-06 14:08:49 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-07 18:34:00 +0200
commit95421552be87d17353ba5a351a096e2b4bfdfae8 (patch)
tree3719ad157309dea78ef9b268987d0636ec6223cd /source3/Makefile.in
parent674a78d60a7dbc4d2af1b229a6b3b2a96c2517f3 (diff)
downloadsamba-95421552be87d17353ba5a351a096e2b4bfdfae8.tar.gz
samba-95421552be87d17353ba5a351a096e2b4bfdfae8.tar.bz2
samba-95421552be87d17353ba5a351a096e2b4bfdfae8.zip
Reintroduce merged build, using waf to build smbtorture4.
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 13cc776115..11b5e5343c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3213,3 +3213,17 @@ libnetapi_examples: libnetapi
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
+
+../source4/configure: ../buildtools/scripts/configure.waf
+ cd ../source4 && ./autogen.sh
+
+samba4-configure:
+ @test -f ../source4/.lock-wscript || ( cd ../source4 && ./configure.developer --prefix="$(prefix)")
+
+.PHONY: samba4-configure
+
+bin/smbtorture4: samba4-configure
+ cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture
+ cp ../source4/bin/smbtorture bin/smbtorture4
+
+.PHONY: bin/smbtorture4