X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Makefile;h=9431cfe0c450d6b5b0c434fe720ce028acfdf795;hb=05fab45b5f96c457d3c6b359f66ce1506c6ad510;hp=0c860c48ba34542fee0a9f8ce238c149cf283d4e;hpb=d8bc539afe01f0fb69fe1a63148c5c20eec19723;p=senf.git

diff --git a/Makefile b/Makefile
index 0c860c4..9431cfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 #----------------------------------------------------------------------
 # Some SCONS shortcuts
 #----------------------------------------------------------------------
-SCONS=scons
+
+CONCURRENCY_LEVEL ?= 1
+
+SCONS=scons -j $(CONCURRENCY_LEVEL)
 
 default: build
 
@@ -9,88 +12,34 @@ build:
 	$(SCONS)
 
 clean:
-	$(SCONS) --clean
+	$(SCONS) --clean all
 
-all_docs all_tests:
+all_docs all_tests all:
 	$(SCONS) $@
 
 #----------------------------------------------------------------------
 # Subversion stuff
 #----------------------------------------------------------------------
-SVN_REVISION = $(shell svn info|grep '^Revision: '|awk '{print $$2}')
 
 svn_version:
-	@echo $(SVN_REVISION)
+	@svnversion
 
 #----------------------------------------------------------------------
 # Building SENF requires some debian packages
 #----------------------------------------------------------------------
-DEB_BASE   = scons build-essential binutils-dev
-DEB_BOOST  = libboost-dev libboost-test-dev
-DEB_BOOST += libboost-date-time-dev libboost-regex-dev libboost-thread-dev
-DEB_DOC    = doxygen dia tidy xsltproc graphviz
-
-prerequisites:
-	aptitude install $(DEB_BASE) $(DEB_BOOST) $(DEB_DOC)
-
-#----------------------------------------------------------------------
-# Debian package info
-#----------------------------------------------------------------------
-PKG_NAME=senf-dev
-PKG_ARCH=i386
-PKG_VERS=0.0.$(SVN_REVISION)-1
-PKG_FILE = $(PKG_NAME)-$(PKG_VERS)_$(PKG_ARCH).deb
-
-#----------------------------------------------------------------------
-# Debian package structure
-#----------------------------------------------------------------------
-DEB_TOP = ./debian
-DEB_CTL = $(DEB_TOP)/DEBIAN
-DEB_LIB = $(DEB_TOP)/usr/lib/senf
-DEB_INC = $(DEB_TOP)/usr/include/senf
-DEB_DOC = $(DEB_TOP)/usr/share/doc/senf
-
-#----------------------------------------------------------------------
-# Debian package content
-#----------------------------------------------------------------------
-SENF_LIBS = *.a
-SENF_HDRS = $$(find -path './XXXdebian' -prune \
-                 -o -iname \*.h \
-                 -o -iname \*.hh \
-                 -o -iname \*.ih \
-                 -o -iname \*.c \
-                 -o -iname \*.cc \
-                 -o -iname \*.ct \
-                 -o -iname \*.cci \
-                 -o -iname \*.cti \
-                 -o -iname \*.mpp \
-)
+DEB_BASE   = build-essential
 
-package: $(PKG_FILE)
-$(PKG_FILE): build
-	rm -rf $(DEB_TOP)
-	mkdir -p $(DEB_CTL) $(DEB_INC) $(DEB_LIB) $(DEB_DOC)
-	find $(DEB_TOP) -type d | xargs chmod 755
-	tar cf - $(SENF_HDRS) | (cd $(DEB_INC) && tar xf -)
-	tar cf - $(SENF_LIBS) | (cd $(DEB_LIB) && tar xf -)
-	sed -e 's,PKG_VERSION,$(PKG_VERS),' control > $(DEB_CTL)/control
-	$(MAKE) deb-doc
-	dpkg-deb --build debian $(PKG_FILE)
+# 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)
 
-#----------------------------------------------------------------------
-# Extract documentation files from source tree
-#----------------------------------------------------------------------
-deb-doc:
-	rsync -rz \
-		--filter="- debian/*" \
-		--filter="- .svn" \
-		--filter="+ */" \
-		--filter="+ *.html" \
-		--filter="+ *.css" \
-		--filter="+ *.png" \
-		--filter="+ *.php" \
-		--filter="+ *.idx" \
-		--filter="+ *.log" \
-		--filter="- *" \
-		. $(DEB_DOC)
+prerequisites:
+	aptitude install $(DEB_BASE) $(DEB_SENF)
 
+package:
+	$(SCONS) deb