makefile geupdated. könnte mit gnu-make kaputtgehen :/

2 files changed, 11 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 98b4d9c..e7a632c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,22 @@
-all: detect_road_borders mariokart01
+.SUFFIXES: .cpp .o 
+.PHONY: clean
 
-detect_road_borders: detect_road_borders.cpp
-	g++ `pkg-config --libs --cflags opencv` -g $< -o $@
-
-road_thresholder.o: road_thresholder.cpp road_thresholder.h
-	g++ `pkg-config --cflags opencv` -g road_thresholder.cpp -c
+all: detect_road_borders mariokart
 
-horizon_steerer.o: horizon_steerer.cpp horizon_steerer.h
-	g++ `pkg-config --cflags opencv` -g horizon_steerer.cpp -c
+clean:
+	rm -f *.o mariokart detect_road_borders
 
-naive_steerer.o: naive_steerer.cpp naive_steerer.h
-	g++ `pkg-config --cflags opencv` -g naive_steerer.cpp -c
+.cpp.o:
+	g++ `pkg-config --cflags opencv` -g -c $<
 
-steer_accumulator.o: steer_accumulator.cpp steer_accumulator.h
-	g++ `pkg-config --cflags opencv` -g steer_accumulator.cpp -c
 
-util.o: util.cpp util.h
-	g++ `pkg-config --cflags opencv` -g util.cpp -c
+detect_road_borders: detect_road_borders.cpp
+	g++ `pkg-config --libs --cflags opencv` -g $^ -o $@
 
 test_detect: detect_road_borders
 	./detect_road_borders test.mpg
 
-mariokart01.o: mariokart01.cpp
-	g++ `pkg-config --cflags opencv` -lxcb -lpthread -g mariokart01.cpp -c
 
-mariokart01: mariokart01.o road_thresholder.o horizon_steerer.o naive_steerer.o steer_accumulator.o util.o
-	g++ `pkg-config --libs --cflags opencv` -lxcb -lpthread -g mariokart01.o road_thresholder.o horizon_steerer.o naive_steerer.o steer_accumulator.o util.o -o $@
+mariokart: mariokart.o road_thresholder.o horizon_steerer.o naive_steerer.o steer_accumulator.o util.o
+	g++ `pkg-config --libs --cflags opencv` -lxcb -lpthread -g $> -o $@
 
diff --git a/mariokart01.cpp b/mariokart.cpp
index dc6eaa9..dc6eaa9 100644
--- a/mariokart01.cpp
+++ b/mariokart.cpp