X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fteleshield-v0.1%2FMakefile;h=f54488a25c14bbae1708d98a3d6d48367e986960;hb=eb70e334ffc77e737bb21ab3fe777a982d80ee3b;hp=c1f45f37ecd1eae2f9f7c1434b285e6e51a85a71;hpb=040a6eb119451026e1ec7c3a6a8e76b439c632d5;p=fw%2Faltos

diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index c1f45f37..f54488a2 100644
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -17,8 +17,8 @@ TELESHIELD_SRC = \
 	ao_btm.c \
 	ao_spi.c
 
-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
@@ -72,7 +72,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teleshield-v$(TELESHIELD_VER)-$(VERSION).ihx
+PROGNAME = teleshield-v$(TELESHIELD_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleShield-v$(TELESHIELD_VER)
 PRODUCT_DEF=-DTELESHIELD_V_$(TELESHIELD_DEF)
 IDPRODUCT=0x0013
@@ -91,10 +92,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 +103,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: