Instead of using git revision counts for version numbers, use explicit
versions numbers configured in the configure.ac file. Expose published
files with version numbers.
Signed-off-by: Keith Packard <keithp@keithp.com>
18 files changed:
WINDOWS_ICON=$(top_srcdir)/icon/altus-metrum.ico
# Firmware
WINDOWS_ICON=$(top_srcdir)/icon/altus-metrum.ico
# Firmware
-FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2.ihx
-FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0.ihx
+FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
# Distribution targets
FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
# Distribution targets
FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
-LINUX_FILES=$(FAT_FILES) libaltos.so
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
- makensis -Oaltos-windows.log "-XOutFile $@" altos-windows.nsi
\ No newline at end of file
+ makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
\ No newline at end of file
- File "../../src/telemetrum-v1.0/telemetrum-v1.0.ihx"
- File "../../src/teledongle-v0.2/teledongle-v0.2.ihx"
+ File "../../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
+ File "../../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
ao-tools/libaltos/Makefile
ao-tools/altosui/Makefile
ao-utils/Makefile
ao-tools/libaltos/Makefile
ao-tools/altosui/Makefile
ao-utils/Makefile
SUBDIRS=telemetrum-v1.0 teledongle-v0.2 telemetrum-v0.1-sky telemetrum-v0.1-sirf teledongle-v0.1 tidongle test
all: all-recursive
SUBDIRS=telemetrum-v1.0 teledongle-v0.2 telemetrum-v0.1-sky telemetrum-v0.1-sirf teledongle-v0.1 tidongle test
all: all-recursive
-VERSION=$(shell git describe)
endif
CFLAGS=--model-small --debug --opt-code-speed
endif
CFLAGS=--model-small --debug --opt-code-speed
../altitude.h: make-altitude
nickle $< > $@
../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) > $@
$(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$@ $<
ao_product.rel: ao_product.c ao_product.h
$(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<
-PROG = teledongle-v0.1.ihx
+PROG = teledongle-v0.1-$(VERSION).ihx
-PROG = teledongle-v0.2.ihx
+PROG = teledongle-v0.2-$(VERSION).ihx
-PROG = telemetrum-v0.1-sirf.ihx
+PROG = telemetrum-v0.1-sirf-$(VERSION).ihx
-PROG = telemetrum-v0.1-sky.ihx
+PROG = telemetrum-v0.1-sky-$(VERSION).ihx
-PROG = telemetrum-v1.0.ihx
+PROG = telemetrum-v1.0-$(VERSION).ihx
+PROG = tidongle-$(VERSION).ihx