Merge branch 'master' of git://git.gag.com/fw/altos

[fw/altos] / src / Makefile.proto

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 59a3b8a616d7969a80f0ba24f12f85703aa6b6a3..b23eb2571255cdfea257e88c386393b0869a4ab7 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
@@ -214,11 +214,9 @@ all: ../$(PROG)
 ../altitude.h: make-altitude
        nickle $< > $@
 
-ao_product.h: ao-make-product.5c always
+ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
-always:
-
 ao_product.rel: ao_product.c ao_product.h
        $(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<