X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftest%2FMakefile;h=4e403da6a113a529f48a28af3b6e87e608a6873c;hp=33203ffd25c2d3980c6fccf5232db272ca73ad80;hb=51aef5d4fc29986353ad887f4a67ed2fe35f8c8e;hpb=a9dae18a664f70b668159487015e61be7f776926

diff --git a/src/test/Makefile b/src/test/Makefile
index 33203ffd..4e403da6 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,9 +1,10 @@
-vpath % ..
-vpath % ../kalman
+vpath % ..:../core:../drivers:../util
 
-PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_gps_test ao_gps_test_skytraq ao_convert_test
+PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noisy_accel ao_gps_test ao_gps_test_skytraq ao_convert_test
 
-CFLAGS=-I.. -I.
+KALMAN=make-kalman 
+
+CFLAGS=-I.. -I. -I../core -I../drivers -O0 -g
 
 all: $(PROGS)
 
@@ -13,22 +14,25 @@ clean:
 install:
 
 ao_flight_test: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.c altitude.h ao_kalman.h
-	cc -g -o $@ $<
+	cc $(CFLAGS) -o $@ $<
+
+ao_flight_test_noisy_accel: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.c altitude.h ao_kalman.h
+	cc -DNOISY_ACCEL=1 $(CFLAGS) -o $@ $<
 
 ao_flight_test_baro: ao_flight_test.c ao_host.h ao_flight.c  ao_sample.c ao_kalman.c altitude.h ao_kalman.h
-	cc -g -o $@ -DHAS_ACCEL=0 ../ao_flight_test.c
+	cc $(CFLAGS) -o $@ -DHAS_ACCEL=0 ao_flight_test.c
 
 ao_flight_test_accel: ao_flight_test.c ao_host.h ao_flight.c  ao_sample.c ao_kalman.c altitude.h ao_kalman.h
-	cc -g -o $@ -DFORCE_ACCEL=1 ../ao_flight_test.c
+	cc $(CFLAGS) -o $@ -DFORCE_ACCEL=1 ao_flight_test.c
 
 ao_gps_test: ao_gps_test.c ao_gps_sirf.c ao_gps_print.c ao_host.h
-	cc -g -o $@ $<
+	cc $(CFLAGS) -o $@ $<
 
 ao_gps_test_skytraq: ao_gps_test_skytraq.c ao_gps_skytraq.c ao_gps_print.c ao_host.h
-	cc -g -o $@ $<
+	cc $(CFLAGS) -o $@ $<
 
 ao_convert_test: ao_convert_test.c ao_convert.c altitude.h
-	cc -g -o $@ $<
+	cc $(CFLAGS) -o $@ $<
 
-../ao_kalman.h: make-kalman kalman.5c kalman_filter.5c load_csv.5c matrix.5c
-	sh $< > $@
+ao_kalman.h: $(KALMAN)
+	(cd .. && make ao_kalman.h)
\ No newline at end of file