altos: Restructure altos build to prepare for multi-arch support

[fw/altos] / src / test / Makefile

diff --git a/src/test/Makefile b/src/test/Makefile
index 33203ffd25c2d3980c6fccf5232db272ca73ad80..333850e4e9c15963678fe9c572d98e97ee1aa2ce 100644 (file)
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,9 +1,8 @@
-vpath % ..
-vpath % ../kalman
+vpath % ..:../core:../drivers
 
 PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_gps_test ao_gps_test_skytraq ao_convert_test
 
-CFLAGS=-I.. -I.
+CFLAGS=-I.. -I. -I../core -I../drivers -O0 -g
 
 all: $(PROGS)
 
@@ -13,22 +12,19 @@ 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_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 $@ $<
-
-../ao_kalman.h: make-kalman kalman.5c kalman_filter.5c load_csv.5c matrix.5c
-       sh $< > $@
+       cc $(CFLAGS) -o $@ $<