diff options
| author | Florian Jung <flo@windfisch.org> | 2014-09-06 23:14:52 +0200 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2014-09-06 23:14:52 +0200 |
| commit | 1fbf21ce79b4ea3c37e1b6dfc7a038a700d75d8c (patch) | |
| tree | e6761bb61b83476a24d289ff7e3a7b8301a20c56 | |
| parent | b9dcd4d5e8c910fad32f8884a4c83872d77807b8 (diff) | |
fixed makefile to work with gnumake
| -rw-r--r-- | GNUmakefile | 23 | ||||
| -rw-r--r-- | Makefile | 6 |
2 files changed, 3 insertions, 26 deletions
diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 56d8b79..0000000 --- a/GNUmakefile +++ /dev/null @@ -1,23 +0,0 @@ -.PHONY: clean - -all: detect_road_borders mariokart - -clean: - rm -f *.o mariokart detect_road_borders - -.cpp.o: - g++ `pkg-config --cflags opencv` -g -c $< - -detect_road_borders: detect_road_borders.cpp - g++ `pkg-config --libs --cflags opencv` -g detect_road_borders.cpp -o detect_road_borders - -detect_road_borders_with_horizon_steerer: detect_road_borders_with_horizon_steerer.cpp util.cpp horizon_steerer.cpp - g++ `pkg-config --libs --cflags opencv` -g detect_road_borders_with_horizon_steerer.cpp util.cpp horizon_steerer.cpp -o detect_road_borders_with_horizon_steerer - -test_detect: detect_road_borders - ./detect_road_borders test.mpg - - -mariokart: mariokart.cpp os.h joystick.cpp xorg_grabber.cpp road_thresholder.cpp horizon_steerer.cpp naive_steerer.cpp steer_accumulator.cpp util.cpp - g++ `pkg-config --libs --cflags opencv` -lxcb -lpthread -g mariokart.cpp os.h joystick.cpp xorg_grabber.cpp road_thresholder.cpp horizon_steerer.cpp naive_steerer.cpp steer_accumulator.cpp util.cpp -o mariokart - @@ -13,15 +13,15 @@ joystick.o: joystick.cpp os.h g++ `pkg-config --cflags opencv` -g -c $< detect_road_borders: detect_road_borders.cpp - g++ `pkg-config --libs --cflags opencv` -g $> -o $@ + g++ `pkg-config --libs --cflags opencv` -g $^ -o $@ detect_road_borders_with_horizon_steerer: detect_road_borders_with_horizon_steerer.cpp horizon_steerer.o util.o - g++ `pkg-config --libs --cflags opencv` -g $> -o $@ + g++ `pkg-config --libs --cflags opencv` -g $^ -o $@ test_detect: detect_road_borders ./detect_road_borders test.mpg mariokart: mariokart.o os.h joystick.o xorg_grabber.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 $@ + g++ `pkg-config --libs --cflags opencv` -lxcb -lpthread -g $^ -o $@ |