From: Bdale Garbee <bdale@gag.com>
Date: Wed, 19 Aug 2009 06:49:24 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 0.5^0
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=4486d9156e19e4280b42bcd422d81d04f2d04a92;hp=-c

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

4486d9156e19e4280b42bcd422d81d04f2d04a92
diff --combined src/Makefile
index 5a8afe0b,9cc322a2..96049c65
--- a/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