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

diff --combined src/Makefile
index 5a8afe0b9a5859a55abd80e313973d307d06eefd,9cc322a2d635949c49179b69ad1e0cc4383019ad..96049c65f11af939d736518695badd6554b4ec90
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -4,9 -4,7 +4,9 @@@
  #
  CC=sdcc
  
 +ifndef VERSION
  VERSION=$(shell git describe)
 +endif
  
  CFLAGS=--model-small --debug --opt-code-speed
  
@@@ -262,8 -260,8 +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_host.h
+ ao_gps_test: ao_gps.c ao_gps_test.c ao_gps_print.c ao_host.h
        cc -g -o $@ ao_gps_test.c