altos: Have 'make clean' remove all programs, even old ones

[fw/altos] / src / product / Makefile.telebt

diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index 46c87db0865782f393497c0baa35296d3badc552..fd52cec4f0133f03ab1bdfed1cfb8f13a2e508af 100644 (file)
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -15,6 +15,8 @@ endif
 INC = \
        ao.h \
        ao_pins.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
        cc1111.h \
        ao_product.h \
        $(TELEBT_INC)
@@ -28,19 +30,19 @@ CORE_SRC = \
        ao_panic.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_serial.c \
+       ao_string.c \
        ao_timer.c \
        ao_usb.c \
        _bp.c
@@ -58,7 +60,8 @@ SRC = \
        $(PRODUCT_SRC) \
        $(TELEBT_SRC)
 
-PROG = telebt-v$(TELEBT_VER)-$(VERSION).ihx
+PROGNAME = telebt-v$(TELEBT_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleBT-v$(TELEBT_VER)
 PRODUCT_DEF=-DTELEBT_V_$(TELEBT_DEF)
 IDPRODUCT=0x000e
@@ -76,22 +79,18 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
+$(PROG): $(REL) Makefile
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-       $(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+       $(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(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: