X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fteleterra-v0.2%2FMakefile;h=88637360d35f191be751c532af839a30d52d051e;hp=4967d1874722a54f44510f584de90acc51d28a02;hb=488a527267decece48e6682e0e0c7fc29cbed329;hpb=c1d12a117b36de7fe8dd992959b890bfd1163e81

diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 4967d187..88637360 100644
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -52,7 +52,8 @@ CC1111_SRC = \
 DRIVER_SRC = \
 	ao_m25.c \
 	ao_lcd.c \
-	ao_gps_skytraq.c
+	ao_gps_skytraq.c \
+	ao_gps_show.c
 
 PRODUCT_SRC = \
 	ao_teleterra_0_2.c \
@@ -66,7 +67,8 @@ SRC = \
 
 TELETERRA_VER=0.2
 TELETERRA_DEF=0_2
-PROG = teleterra-v$(TELETERRA_VER)-$(VERSION).ihx
+PROGNAME = teleterra-v$(TELETERRA_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleTerra-v$(TELETERRA_VER)
 PRODUCT_DEF=-DTELETERRA_V_$(TELETERRA_DEF)
 IDPRODUCT=0x000d
@@ -84,10 +86,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
@@ -95,11 +97,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: