Add initial teleterra implementation.

[fw/altos] / src / Makefile.proto

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 6cb6e0de3e5599bdd754de7dd1b9ed6f0a991893..2365030b2a0ac1b6f1197b1b85d4088a39aacce9 100644 (file)
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -10,7 +10,7 @@ vpath ao-make-product.5c ..
 CC=sdcc
 
 ifndef VERSION
-VERSION=$(shell git describe)
+include ../Version
 endif
 
 CFLAGS=--model-small --debug --opt-code-speed
@@ -35,6 +35,7 @@ ALTOS_SRC = \
        ao_panic.c \
        ao_task.c \
        ao_timer.c \
+       ao_romconfig.c \
        _bp.c
 
 #
@@ -146,6 +147,10 @@ TI_SRC = \
 
 TT_MAIN_SRC = \
        ao_teleterra.c
+
+TT_TASK_SRC = \
+       ao_terraui.c
+
 #
 # All sources for TeleTerra
 #
@@ -155,8 +160,8 @@ TT_SRC = \
        $(TELE_RECEIVER_SRC) \
        $(TELE_DRIVER_SRC) \
        $(TELE_COMMON_SRC) \
-       $(TT_MAIN_SRC)
-
+       $(TT_MAIN_SRC) \
+       $(TT_TASK_SRC)
 
 #
 # Sources for TeleDongle
@@ -207,14 +212,14 @@ quiet ?= $($1)
 all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile Makefile.defs ../Makefile.proto
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && mv $(PROG) $(PMAP) ..
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
        $(call quiet,CHECK_STACK) ../ao.h $(PMEM)
 
 ../altitude.h: make-altitude
        nickle $< > $@
 
-ao_product.h: ao-make-product.5c
-       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -p $(PRODUCT) -v $(VERSION) > $@
+ao_product.h: ao-make-product.5c ../Version
+       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
 ao_product.rel: ao_product.c ao_product.h
        $(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<