Merge remote-tracking branch 'origin/master'

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

diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 3bd1422600f89925e227b022bf5574d350f0b352..0884079eb701543cc090c3e0ea7358b0c4ac1123 100644 (file)
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -15,6 +15,8 @@ endif
 INC = \
        ao.h \
        ao_pins.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
        cc1111.h \
        ao_product.h
 
@@ -33,7 +35,8 @@ CORE_SRC = \
        ao_stdio.c \
        ao_storage.c \
        ao_task.c \
-       ao_telemetry.c
+       ao_telemetry.c \
+       ao_freq.c
 
 CC1111_SRC = \
        ao_adc.c \
@@ -45,6 +48,7 @@ CC1111_SRC = \
        ao_packet_slave.c \
        ao_radio.c \
        ao_romconfig.c \
+       ao_string.c \
        ao_timer.c \
        _bp.c
 
@@ -59,7 +63,8 @@ SRC = \
        $(DRIVER_SRC) \
        $(PRODUCT_SRC)
 
-PROG = telemini-v$(TELEMINI_VER)-$(VERSION).ihx
+PROGNAME = telemini-v$(TELEMINI_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMini-v$(TELEMINI_VER)
 PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
 IDPRODUCT=0x000a
@@ -78,22 +83,18 @@ 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) ..
-       $(call quiet,CHECK_STACK) ../core/ao.h $(PMEM)
+$(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
        $(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: