X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fproduct%2FMakefile.telemetrum;h=c740a4831149325ca8bf67965847696de6150598;hp=b111105316814210bd923e4dbf9017a532cd004e;hb=0ff5f0fbc4900ad45bb7910ffc0c5a4e4cc4b857;hpb=ce8153472069ed56b24ac36f297ac569d1f767d4

diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index b1111053..c740a483 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -18,6 +18,8 @@ endif
 INC = \
 	ao.h \
 	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
 	cc1111.h \
 	altitude.h \
 	ao_kalman.h \
@@ -34,8 +36,8 @@ CORE_SRC = \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c \
-	ao_flight_mm.c \
-	ao_sample_mm.c \
+	ao_flight.c \
+	ao_sample.c \
 	ao_kalman.c \
 	ao_log.c \
 	ao_log_big.c \
@@ -73,7 +75,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telemetrum-v$(TM_VER)-$(VERSION)$(TM_EXTRA).ihx
+PROGNAME = telemetrum-v$(TM_VER)$(TM_EXTRA)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMetrum-v$(TM_VER)
 PRODUCT_DEF=-DTELEMETRUM_V_$(TM_DEF)
 IDPRODUCT=0x000b
@@ -91,10 +94,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
@@ -102,11 +105,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: