s3-build: share smbtorture4 build rules with s3-waf build.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Mar 15 16:10:17 CET 2011 on sn-devel-104

diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
new file mode 100644 (file)
index 0000000..939d4d4
--- /dev/null
+++ b/source3/Makefile-smbtorture4
@@ -0,0 +1,23 @@
+WAF_BINARY=buildtools/bin/waf
+WAF=$(WAF_BINARY)
+WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
+SAMBA4_BINARIES="smbtorture,ndrdump"
+
+samba4-configure:
+       @(cd .. && \
+               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 .. && $(WAF_BUILD) --targets=smbtorture
+       cp ../bin/smbtorture bin/smbtorture4
+
+.PHONY: bin/smbtorture4
+
+bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
+       cd .. && $(WAF_BUILD) --targets=ndrdump
+       cp ../bin/ndrdump bin/ndrdump4
+
+.PHONY: bin/ndrdump4

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5b5a93816be8611445588e1b93c6b1e7e3d8d05d..5ebf078617c90f85c4848c2764c3c1944bd9ced0 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3481,24 +3481,8 @@ libnetapi_examples: libnetapi
 clean_libnetapi_examples:
        $(MAKE) -C lib/netapi/examples clean
 
-WAF_BINARY=buildtools/bin/waf
-WAF=$(WAF_BINARY)
-WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
-SAMBA4_BINARIES="smbtorture,ndrdump"
+bin/smbtorture4: $(BINARY_PREREQS)
+       $(MAKE) -f Makefile-smbtorture4 bin/smbtorture4
 
-samba4-configure:
-       @(cd .. && \
-               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 .. && $(WAF_BUILD) --targets=smbtorture
-       cp ../bin/smbtorture bin/smbtorture4
-
-bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
-       cd .. && $(WAF_BUILD) --targets=ndrdump
-       cp ../bin/ndrdump bin/ndrdump4
-
-.PHONY: bin/smbtorture4
+bin/ndrdump4: $(BINARY_PREREQS)
+       $(MAKE) -f Makefile-smbtorture4 bin/ndrdump4

diff --git a/source3/wscript_build b/source3/wscript_build
index 1e0fa4ac13de3d3e4b79b479e635cf02b1482989..3bbeeea6612be413a1dc5bdc9438f6c5b1121daf 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -634,6 +634,12 @@ t = bld.SAMBA_GENERATOR('build_env.h',
 t.env.SRCDIR = bld.path.abspath()
 t.env.BUILDDIR = bld.path.abspath()
 
+if not bld.env.toplevel_build:
+    bld.SAMBA_GENERATOR('smbtorture4',
+                       source='',
+                       target='',
+                       rule='cd ../; make -f Makefile-smbtorture4 bin/smbtorture4',
+                       always=True)
 
 bld.SETUP_BUILD_GROUPS()