svnrevision.sh now better; first looks for svn info, then git-svn, then gives up...

[bachelor-thesis/roomba_tests.git] / Makefile

diff --git a/Makefile b/Makefile
index ac63cfe..60ffab0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,27 @@
-export TARGET=roomba_test
-export SOURCES=main.cc
-export CXXFLAGS=-I/usr/include/qt4 -I/usr/include/qt4/QtCore \
-       -I/usr/include/qt4/QtGui -lQtGui \
-       -I/usr/include/ -I/usr/include/QtCore \
-       -I/usr/include/QtGui -lQtGui 
+WISELIB_PATH=../..
+WISELIB_STABLE=$(WISELIB_PATH)/wiselib.stable
+WISELIB_TESTING=$(WISELIB_PATH)/wiselib.testing
+QTCXXFLAGS=-I/usr/include/qt4 -I/usr/include/qt4/QtCore \
+       -I/usr/include/qt4/QtGui -I/usr/include/QtCore -I/usr/include/QtGui \
+       -lQtGui
+
+CXX=g++
+LD=ld
+CXXFLAGS=-I$(WISELIB_STABLE) -I$(WISELIB_TESTING) -lpthread
+LDFLAGS=
 
 all: roomba_test battery_test
+clean:
+       rm -f roomba_test battery_test svnrevision.h
+
+svnrevision.h:
+       ./svnrevision.sh
 
-include ../Makefile.base
+roomba_test: main.cc svnrevision.h
+       $(CXX) $(CXXFLAGS) $< -o $@ $(QTCXXFLAGS)
 
 battery_test: battery_test.cc
-       $(CXX) -I$(WISELIB_STABLE) -I$(WISELIB_TESTING) -lpthread -o battery_test battery_test.cc
+       $(CXX) $(CXXFLAGS) $< -o $@
 
+.PHONY: svnrevision.h
+# vim: noexpandtab :