X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fproduct%2FMakefile.telemini;h=ff8b9d5649d83e0e9fad17f9710cfe8730e9df03;hb=5a26df7db9453bf0596f729a23efb90e5e8a63c7;hp=f0ab2b14723e2c6019375df51704c1a354efc0cf;hpb=705891be53e298ac6ced4ba02b87d2f6d1085b34;p=fw%2Faltos

diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index f0ab2b14..ff8b9d56 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -4,8 +4,8 @@
 # Define TELEMINI_VER and TELEMINI_DEF and then
 # include this 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
@@ -24,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 \
@@ -63,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
@@ -82,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
@@ -93,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: