altos: use %lu for APRS altitude in sprintf

[fw/altos] / src / tidongle / Makefile

diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index 698d612c799591b2132ee2e9f5d0ca4fe878acd0..0e90d74485d52d01f37584fb417153364d10e273 100644 (file)
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -2,8 +2,8 @@
 # TIDongle build file
 #
 
-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
@@ -26,17 +26,16 @@ CORE_SRC = \
        ao_rssi.c \
        ao_state.c \
        ao_stdio.c \
-       ao_task.c
+       ao_task.c \
+       ao_freq.c
 
 CC1111_SRC = \
-       ao_aes.c \
        ao_dbg.c \
        ao_dma.c \
        ao_led.c \
        ao_packet.c \
        ao_packet_master.c \
        ao_radio.c \
-       ao_radio_cmac.c \
        ao_romconfig.c \
        ao_string.c \
        ao_timer.c \
@@ -54,7 +53,8 @@ SRC = \
        $(DRIVER_SRC) \
        $(PRODUCT_SRC)
 
-PROG = tidongle-$(VERSION).ihx
+PROGNAME = tidongle
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TIDongle
 PRODUCT_DEF=-DTIDONGLE
 IDPRODUCT=0x000a
@@ -72,10 +72,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
@@ -83,11 +83,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: