X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Makefile;h=d838e92466909df02f1ed7766e91bd511330d251;hb=84f14a42f9993e186c7897ce0db021300e0a2d48;hp=250155cb2b7e9bc64d93bff3858dfe216289a135;hpb=aa6d4257b224443aebac2a9506f633a4c6b0cf1e;p=senf.git

diff --git a/Makefile b/Makefile
index 250155c..d838e92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,62 @@
 #----------------------------------------------------------------------
 # Some SCONS shortcuts
 #----------------------------------------------------------------------
+CONCURRENCY_LEVEL ?= $(shell grep process /proc/cpuinfo | wc -l)
 
-CONCURRENCY_LEVEL ?= 2
-
+ifdef nice
+  SCONS_ARGS += CXX='nice -n $(nice) g++'
+endif
 ifdef final
-  FINAL = "final=1"
+  SCONS_ARGS += "final="$(final)
+endif
+ifdef debug
+  SCONS_ARGS += "debug="$(debug)
 endif
 
-SCONS=scons -j $(CONCURRENCY_LEVEL) $(FINAL)
+SCONS=./tools/scons -j $(CONCURRENCY_LEVEL) $(SCONS_ARGS)
 
-default: build
+# DON'T call this default ... default is a valid scons target ;-)
+build: default
 
-build:
-	$(SCONS)
+TARGETS := prepare default examples all_tests all_docs all install_all \
+	deb debsrc debbin linklint fixlinks valgrind lcov
+ALLTARGETS := $(TARGETS) package build
+
+$(TARGETS):
+	$(SCONS) $@
 
 clean:
 	$(SCONS) --clean all
 
-all_docs all_tests all:
-	$(SCONS) $@
-	
+package: deb
+test_coverage: lcov
+
+#----------------------------------------------------------------------
+# subdirectory build targets
+#----------------------------------------------------------------------
+
 %/test %/doc:
 	$(SCONS) $@
 
+%/build:
+	$(SCONS) $*
+
+#----------------------------------------------------------------------
+# remote compile targets
+#----------------------------------------------------------------------
+
+CWD = $(shell pwd)
+$(ALLTARGETS:%=%@%):
+	ssh $* "cd $(CWD) && $(MAKE) SCONS_ARGS=\"$(SCONS_ARGS)\" $(firstword $(subst @, ,$@))"
+
 #----------------------------------------------------------------------
 # Subversion stuff
 #----------------------------------------------------------------------
 
 svn_version:
-	@svnversion
+	@v=`svnversion`; if [ $$v=="exported" ]; then gitsvnversion else echo $v; fi
+
+version: svn_version
 
 #----------------------------------------------------------------------
 # Building SENF requires some debian packages
@@ -37,16 +64,11 @@ svn_version:
 DEB_BASE   = build-essential
 
 # This line parses the 'Build-Depends' entry from debian/control
-DEB_SENF   = $(shell perl -an -F'[:,]' -e '					\
-	       	         BEGIN{ $$,=" " }					\
-	       	         $$P=0 if /^\S/;					\
-			 map {s/\(.*\)//} @F;					\
-	       	         print @F if $$P;					\
-	       	         if (/^Build-Depends:/) { print @F[1..$$\#F]; $$P=1 }'	\
-	       	     debian/control | xargs echo)
+DEB_SENF   = $(shell perl -alnF'[:,]' -e '							\
+			BEGIN{$$,=" "} END{splice @R,0,1; print @R}				\
+			map {s/\(.*\)|\|.*//; s/[ \n\t]//g} @F;					\
+			push @R,grep {/./} @F if (/^Build-Depends:/i.../^\S/)!~/(^|E0)$$/;'	\
+				debian/control)
 
 prerequisites:
 	aptitude install $(DEB_BASE) $(DEB_SENF)
-
-package:
-	$(SCONS) deb