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

diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index a55bcf95..e1e350a6 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -4,8 +4,8 @@
 # Define TELENANO_VER and TELENANO_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
@@ -31,7 +31,7 @@ CORE_SRC = \
 	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 \
@@ -62,7 +62,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telenano-v$(TELENANO_VER)-$(VERSION).ihx
+PROGNAME = telenano-v$(TELENANO_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleNano-v$(TELENANO_VER)
 PRODUCT_DEF=-DTELENANO_V_$(TELENANO_DEF)
 IDPRODUCT=0x000a
@@ -81,10 +82,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
@@ -92,11 +93,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: