altoslib: fix computation of TeleGPS battery voltage

[fw/altos] / src / teleshield-v0.1 / Makefile

diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index b63a81d6aa40ca824f0be20f97981d7a624757e0..f54488a25c14bbae1708d98a3d6d48367e986960 100644 (file)
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -17,8 +17,8 @@ TELESHIELD_SRC = \
        ao_btm.c \
        ao_spi.c
 
-vpath %.c ..:../core:../cc1111:../drivers:../product:.
-vpath %.h ..:../core:../cc1111:../drivers:../product:.
+vpath %.c ..:../kernel:../cc1111:../drivers:../product:.
+vpath %.h ..:../kernel:../cc1111:../drivers:../product:.
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
@@ -41,7 +41,8 @@ CORE_SRC = \
        ao_state.c \
        ao_storage.c \
        ao_stdio.c \
-       ao_task.c
+       ao_task.c \
+       ao_freq.c
 
 CC1111_SRC = \
        ao_dbg.c \
@@ -62,7 +63,8 @@ DRIVER_SRC = \
        $(TELESHIELD_SRC)
 
 PRODUCT_SRC = \
-       ao_teleshield.c
+       ao_teleshield.c \
+       ao_ardu_serial.c
 
 SRC = \
        $(CORE_SRC) \
@@ -70,7 +72,8 @@ SRC = \
        $(DRIVER_SRC) \
        $(PRODUCT_SRC)
 
-PROG = teleshield-v$(TELESHIELD_VER)-$(VERSION).ihx
+PROGNAME = teleshield-v$(TELESHIELD_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleShield-v$(TELESHIELD_VER)
 PRODUCT_DEF=-DTELESHIELD_V_$(TELESHIELD_DEF)
 IDPRODUCT=0x0013
@@ -89,10 +92,10 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
+$(PROG): $(REL) Makefile
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
        $(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
@@ -100,11 +103,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:     clean
 
-clean:
-       rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-       rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-       rm -f ao_product.h
-       rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install: