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

diff --git a/Makefile b/Makefile
index 0c860c4..ae3cae0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ build:
 	$(SCONS)
 
 clean:
-	$(SCONS) --clean
+	$(SCONS) --clean all
 
 all_docs all_tests:
 	$(SCONS) $@
@@ -17,7 +17,7 @@ all_docs all_tests:
 #----------------------------------------------------------------------
 # Subversion stuff
 #----------------------------------------------------------------------
-SVN_REVISION = $(shell svn info|grep '^Revision: '|awk '{print $$2}')
+SVN_REVISION = $(shell svnversion)
 
 svn_version:
 	@echo $(SVN_REVISION)
@@ -33,64 +33,5 @@ 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 \
-)
-
-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)
-
-#----------------------------------------------------------------------
-# 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)
-
+package:
+	$(SCONS) deb