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

diff --git a/Makefile b/Makefile
index 0c860c4..8aa0222 100644
--- a/Makefile
+++ b/Makefile
@@ -1,96 +1,42 @@
 #----------------------------------------------------------------------
 # Some SCONS shortcuts
 #----------------------------------------------------------------------
-SCONS=scons
 
-default: build
+SCONS=./tools/scons
 
-build:
-	$(SCONS)
+# DON'T call this default ... default is a valid scons target ;-)
+build: default
+.PHONY: build
 
-clean:
-	$(SCONS) --clean
+clean: message
+	$(SCONS) --clean all
+.PHONY: clean
 
-all_docs all_tests:
-	$(SCONS) $@
+Makefile:
+	@true
 
-#----------------------------------------------------------------------
-# Subversion stuff
-#----------------------------------------------------------------------
-SVN_REVISION = $(shell svn info|grep '^Revision: '|awk '{print $$2}')
+# Forward everything else to scons
+%: message
+	$(SCONS) $@
 
-svn_version:
-	@echo $(SVN_REVISION)
-
-#----------------------------------------------------------------------
-# 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
+message:
+	@echo "================================================================="
+	@echo "SENF uses SCons as it's build system, so instead of calling"
+	@echo "    $$ make <target>"
+	@echo
+	@echo "use"
+	@echo "    $$ ./tools/scons <target>"
+	@echo
+	@echo "To get help on valid targets an configuration variables, call"
+	@echo "    $$ ./tools/scons -h"
+	@echo
+	@echo "To get help on scons command line options, call"
+	@echo "    $$ ./tools/scons -H"
+	@echo
+	@echo "(interesting options: -c, -U, -j <num-cpus>, --config=force)"
+	@echo "================================================================="
+	sleep 5
 
 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)
-
+	./debian/install-depends.sh
+.PHONY: prerequisites