Merge remote-tracking branch 'origin/master'

[fw/altos] / src / teleterra-v0.2 / Makefile

diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 65db57ce5191a0e1167174f7dca904c4059ff7ba..88637360d35f191be751c532af839a30d52d051e 100644 (file)
--- 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 \
@@ -85,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