X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fproduct%2FMakefile.telemini;h=0884079eb701543cc090c3e0ea7358b0c4ac1123;hp=9506eb65319fb3b9fcbc01da1feb3e1b3c5e6593;hb=488a527267decece48e6682e0e0c7fc29cbed329;hpb=090dc9aecdf4cfd1ac727325ae141d441c5b28aa

diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 9506eb65..0884079e 100644
--- 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
 
@@ -22,14 +24,14 @@ CORE_SRC = \
 	ao_cmd.c \
 	ao_config.c \
 	ao_convert.c \
-	ao_flight_mm.c \
+	ao_flight.c \
 	ao_kalman.c \
 	ao_log.c \
 	ao_log_tiny.c \
 	ao_mutex.c \
 	ao_panic.c \
 	ao_report.c \
-	ao_sample_mm.c \
+	ao_sample.c \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c \
@@ -61,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
@@ -80,10 +83,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
@@ -91,11 +94,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: