altos: Rename 'core' to 'kernel'

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

diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 583805f6f821c2fdd72fdb1aa7141232de73b3cb..826c52e552a17d7042f769c5c8a7d08cb22296c3 100644 (file)
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -2,8 +2,8 @@
 # TeleTerra build 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
@@ -25,12 +25,11 @@ CORE_SRC = \
        ao_mutex.c \
        ao_panic.c \
        ao_report.c \
-       ao_rssi.c \
        ao_sqrt.c \
-       ao_state.c \
        ao_stdio.c \
        ao_storage.c \
-       ao_task.c
+       ao_task.c \
+       ao_freq.c
 
 CC1111_SRC = \
        ao_battery.c \
@@ -38,7 +37,6 @@ CC1111_SRC = \
        ao_button.c \
        ao_dbg.c \
        ao_dma.c \
-       ao_led.c \
        ao_packet.c \
        ao_packet_master.c \
        ao_radio.c \
@@ -54,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 \
@@ -68,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
@@ -86,22 +86,18 @@ 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) ..
-       $(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+$(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
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(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: