The branch, master has been updated via 312d097 s3-build: use the simpler "make bin/smbtorture" for s4 torture via 7dcecbd waf: allow for commands like "make bin/smbtorture" from 8a56f8d s3-spoolss: added another intermittent failure to knownfail
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 312d0977a2bd7f3eccff91e6c246a68814a33991 Author: Andrew Tridgell <tri...@samba.org> Date: Wed Oct 6 23:13:14 2010 +1100 s3-build: use the simpler "make bin/smbtorture" for s4 torture and the same for bin/ndrdump Autobuild-User: Andrew Tridgell <tri...@samba.org> Autobuild-Date: Wed Oct 6 12:58:21 UTC 2010 on sn-devel-104 commit 7dcecbd0773b2c342712aa207c941d31f1da7b4a Author: Andrew Tridgell <tri...@samba.org> Date: Wed Oct 6 23:12:44 2010 +1100 waf: allow for commands like "make bin/smbtorture" I finally worked out the GNU make syntax for this ----------------------------------------------------------------------- Summary of changes: buildtools/scripts/Makefile.waf | 4 ++++ source3/Makefile.in | 4 ++-- source4/Makefile | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index 1ccbf4c..c07f859 100644 --- a/buildtools/scripts/Makefile.waf +++ b/buildtools/scripts/Makefile.waf @@ -56,6 +56,10 @@ etags: ctags: $(WAF) ctags +bin/%:: FORCE + $(WAF) --targets=`basename $...@` +FORCE: + configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf ./autogen-waf.sh diff --git a/source3/Makefile.in b/source3/Makefile.in index 8be50fc..c80a874 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3465,11 +3465,11 @@ samba4-configure: ../source4/configure .PHONY: samba4-configure bin/smbtorture4: $(BINARY_PREREQS) samba4-configure - cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture + cd ../source4 && make bin/smbtorture cp ../source4/bin/smbtorture bin/smbtorture4 bin/ndrdump4: $(BINARY_PREREQS) samba4-configure - cd ../source4 && ../buildtools/bin/waf build --targets=ndrdump + cd ../source4 && make bin/ndrdump cp ../source4/bin/ndrdump bin/ndrdump4 .PHONY: bin/smbtorture4 diff --git a/source4/Makefile b/source4/Makefile index e1e53cd..b41b38c 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -58,3 +58,8 @@ etags: ctags: $(WAF) ctags + +# this allows for things like "make bin/smbtorture" +bin/%:: FORCE + $(WAF) --targets=`basename $...@` +FORCE: -- Samba Shared Repository