X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftest%2FMakefile;h=0eaa94214786a3b7ed51ac03d702e661b5f38b57;hp=686fde0c7404a063815f85814a15e1a5b7518ba7;hb=d37945f1404043e6bd287ce7ad7a57bc3289609b;hpb=5d9e715d570b24ac124c30772b11923bd26ed670

diff --git a/src/test/Makefile b/src/test/Makefile
index 686fde0c..0eaa9421 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,15 +1,16 @@
-vpath % ..:../core:../drivers:../util:../micropeak:../aes:../product
+vpath % ..:../kernel:../drivers:../util:../micropeak:../aes:../product:../lisp
 
 PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noisy_accel ao_flight_test_mm \
+	ao_flight_test_metrum \
 	ao_gps_test ao_gps_test_skytraq ao_gps_test_ublox ao_convert_test ao_convert_pa_test ao_fec_test \
 	ao_aprs_test ao_micropeak_test ao_fat_test ao_aes_test ao_int64_test \
-	ao_ms5607_convert_test ao_quaternion_test
+	ao_ms5607_convert_test ao_quaternion_test ao_lisp_test
 
 INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h ao_quaternion.h
 
 KALMAN=make-kalman 
 
-CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -I../product -O0 -g -Wall
+CFLAGS=-I.. -I. -I../kernel -I../drivers -I../micropeak -I../product -I../lisp -O0 -g -Wall -DAO_LISP_TEST -no-pie
 
 all: $(PROGS) ao_aprs_data.wav
 
@@ -33,6 +34,9 @@ ao_flight_test_accel: ao_flight_test.c ao_host.h ao_flight.c  ao_sample.c ao_kal
 ao_flight_test_mm: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.c ao_pyro.c ao_pyro.h $(INCS)
 	cc -DTELEMEGA=1 $(CFLAGS) -o $@ $< -lm
 
+ao_flight_test_metrum: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.c ao_pyro.c ao_pyro.h $(INCS)
+	cc -DTELEMETRUM_V2=1 $(CFLAGS) -o $@ $< -lm
+
 ao_gps_test: ao_gps_test.c ao_gps_sirf.c ao_gps_print.c ao_host.h
 	cc $(CFLAGS) -o $@ $<
 
@@ -52,10 +56,10 @@ ao_kalman.h: $(KALMAN)
 	(cd .. && make ao_kalman.h)
 
 ao_fec_test: ao_fec_test.c ao_fec_tx.c ao_fec_rx.c
-	cc $(CFLAGS) -DAO_FEC_DEBUG=1 -o $@ ao_fec_test.c ../core/ao_fec_tx.c ../core/ao_fec_rx.c -lm
+	cc $(CFLAGS) -DAO_FEC_DEBUG=1 -o $@ ao_fec_test.c ../kernel/ao_fec_tx.c ../kernel/ao_fec_rx.c -lm
 
 ao_aprs_test: ao_aprs_test.c ao_aprs.c
-	cc $(CFLAGS) -o $@ ao_aprs_test.c
+	cc $(CFLAGS) -o $@ ao_aprs_test.c -lm
 
 SOX_INPUT_ARGS=--type raw --encoding unsigned-integer -b 8 -c 1 -r 9600
 SOX_OUTPUT_ARGS=--type wav
@@ -82,4 +86,14 @@ ao_ms5607_convert_test: ao_ms5607_convert_test.c ao_ms5607_convert_8051.c ao_int
 	cc $(CFLAGS) -o $@ ao_ms5607_convert_test.c
 
 ao_quaternion_test: ao_quaternion_test.c ao_quaternion.h
-	cc $(CFLAGS) -o $@ ao_quaternion_test.c -lm
\ No newline at end of file
+	cc $(CFLAGS) -o $@ ao_quaternion_test.c -lm
+
+AO_LISP_OBJS = ao_lisp_test.o ao_lisp_mem.o  ao_lisp_cons.o ao_lisp_string.o \
+	ao_lisp_atom.o ao_lisp_int.o ao_lisp_eval.o ao_lisp_poly.o \
+	ao_lisp_builtin.o ao_lisp_read.o ao_lisp_rep.o ao_lisp_frame.o \
+	ao_lisp_lambda.o ao_lisp_error.o ao_lisp_save.o
+
+ao_lisp_test: $(AO_LISP_OBJS)
+	cc $(CFLAGS) -o $@ $(AO_LISP_OBJS)
+
+$(AO_LISP_OBJS): ao_lisp.h ao_lisp_const.h ao_lisp_os.h