X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Makefile;h=89b925491cced1e7f46245cfaf8ed2d33ee503ad;hb=c3e26baef92c53af9826c2af3bfe4f3570c634bd;hp=0c860c48ba34542fee0a9f8ce238c149cf283d4e;hpb=ffa36b2d409289a2f3f0de46667aa2bf558f393f;p=senf.git

diff --git a/Makefile b/Makefile
index 0c860c4..89b9254 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)
@@ -50,47 +50,5 @@ 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