Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 3928136976259daf9bf8cce48de76183106d3a46..96049c65f11af939d736518695badd6554b4ec90 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,9 @@
 #
 CC=sdcc
 
+ifndef VERSION
 VERSION=$(shell git describe)
+endif
 
 CFLAGS=--model-small --debug --opt-code-speed
 
@@ -181,7 +183,7 @@ SYM=$(REL:.rel=.sym)
 PROGS= telemetrum.ihx tidongle.ihx \
        teleterra.ihx teledongle.ihx
 
-HOST_PROGS=ao_flight_test
+HOST_PROGS=ao_flight_test ao_gps_test
 
 PCDB=$(PROGS:.ihx=.cdb)
 PLNK=$(PROGS:.ihx=.lnk)
@@ -250,6 +252,8 @@ $(TELEDONGLE_DEFS): ao-make-product.5c
 $(TIDONGLE_DEFS): ao-make-product.5c
        nickle ao-make-product.5c -m altusmetrum.org -p TIDongle -v $(VERSION) > $@
 
+distclean:     clean
+
 clean:
        rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
        rm -f $(PROGS) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
@@ -258,5 +262,8 @@ clean:
 
 install:
 
-ao_flight_test: ao_flight.c ao_flight_test.c
+ao_flight_test: ao_flight.c ao_flight_test.c ao_host.h
        cc -g -o $@ ao_flight_test.c
+
+ao_gps_test: ao_gps.c ao_gps_test.c ao_gps_print.c ao_host.h
+       cc -g -o $@ ao_gps_test.c