minor fixes for clang++

[senf.git] / Makefile

diff --git a/Makefile b/Makefile
index 89b9254..8aa0222 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,54 +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:
+clean: message
        $(SCONS) --clean all
+.PHONY: clean
 
-all_docs all_tests:
-       $(SCONS) $@
-
-#----------------------------------------------------------------------
-# Subversion stuff
-#----------------------------------------------------------------------
-SVN_REVISION = $(shell svnversion)
+Makefile:
+       @true
 
-svn_version:
-       @echo $(SVN_REVISION)
+# Forward everything else to scons
+%: message
+       $(SCONS) $@
 
-#----------------------------------------------------------------------
-# 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
-
-package:
-       $(SCONS) deb
+       ./debian/install-depends.sh
+.PHONY: prerequisites