X-Git-Url: http://git.samba.org/samba.git/?p=sharpe%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=Makefile;h=95681ae9de79af20bf25f47125975a07ac9ff1a0;hp=cbbf045062e8cb58ccf5c00af4ef6ed056a3e19b;hb=94a72849fa5be82c785f71ab58b8e813c94c51cd;hpb=72e1a39effba7dca8d437c8cad009be6fb2c4506

diff --git a/Makefile b/Makefile
index cbbf045062e..95681ae9de7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # simple makefile wrapper to run waf
 
-WAF_BINARY=./buildtools/bin/waf
+PYTHON?=python
+WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
 WAF=WAF_MAKE=1 $(WAF_BINARY)
 
 all:
@@ -25,9 +26,18 @@ subunit-test:
 testenv:
 	$(WAF) test --testenv $(TEST_OPTIONS)
 
+gdbtestenv:
+	$(WAF) test --testenv --gdbtest $(TEST_OPTIONS)
+
 quicktest:
 	$(WAF) test --quick $(TEST_OPTIONS)
 
+randomized-test:
+	$(WAF) test --random-order $(TEST_OPTIONS)
+
+testlist:
+	$(WAF) test --list $(TEST_OPTIONS)
+
 dist:
 	touch .tmplock
 	WAFLOCK=.tmplock $(WAF) dist
@@ -66,10 +76,43 @@ etags:
 ctags:
 	$(WAF) ctags
 
-# this allows for things like "make bin/smbtorture"
-bin/%:: FORCE
-	$(WAF) --targets=`basename $@`
-FORCE:
-
 pydoctor:
 	$(WAF) pydoctor
+
+pep8:
+	$(WAF) pep8
+
+# Adding force on the depencies will force the target to be always rebuild form the Make
+# point of view forcing make to invoke waf
+
+bin/smbd: FORCE
+	$(WAF) --targets=smbd/smbd
+
+bin/winbindd: FORCE
+	$(WAF) --targets=winbindd/winbindd
+
+bin/nmbd: FORCE
+	$(WAF) --targets=nmbd/nmbd
+
+bin/smbclient: FORCE
+	$(WAF) --targets=client/smbclient
+
+# this allows for things like "make bin/smbtorture"
+# mainly for the binary that don't have a broken mode like smbd that must
+# be build with smbd/smbd
+bin/%: FORCE
+	$(WAF) --targets=$(subst bin/,,$@)
+
+# Catch all rule to be able to call make service_repl in order to find the name
+# of the submodule you want to build, look at the wscript
+%:
+	$(WAF) --targets=$@
+
+# This rule has to be the last one
+FORCE:
+# Having .NOTPARALLEL will force make to do target once at a time but still -j
+# will be present in the MAKEFLAGS that are in turn interpreted by WAF
+# so only 1 waf at a time will be called but it will still be able to do parralel builds if
+# instructed to do so
+.NOTPARALLEL: %
+.PHONY: FORCE everything testsuite check torture