summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-06 23:13:14 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-06 12:58:21 +0000
commit312d0977a2bd7f3eccff91e6c246a68814a33991 (patch)
tree6cce6daefbc41cc21284cff046d6a4ffa649820d
parent7dcecbd0773b2c342712aa207c941d31f1da7b4a (diff)
downloadsamba-312d0977a2bd7f3eccff91e6c246a68814a33991.tar.gz
samba-312d0977a2bd7f3eccff91e6c246a68814a33991.tar.bz2
samba-312d0977a2bd7f3eccff91e6c246a68814a33991.zip
s3-build: use the simpler "make bin/smbtorture" for s4 torture
and the same for bin/ndrdump Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Oct 6 12:58:21 UTC 2010 on sn-devel-104
-rw-r--r--source3/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8be50fc519..c80a8742d7 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