summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorRalph Giles <giles@mozilla.com>2012-08-16 11:39:56 -0700
committerRalph Giles <giles@mozilla.com>2012-08-16 12:42:32 -0700
commit59c5a82e51b51cc71bd6105a97419f24b8f2d35f (patch)
tree33bd49d902f54ac8412e8a945b0e78a6ad11bc9e /Makefile.am
parent9322362b1ba88aa1a0216bd7dea3c2fb1e5cdca9 (diff)
downloadopus-59c5a82e51b51cc71bd6105a97419f24b8f2d35f.tar.gz
Move the release version string to version.mk.
Previously we defined the release version string in configure.ac, and overrode that with 'git describe --tags' if possible. This made it difficult for non-autoconf builds to set their version string correctly. Instead we create, and check into version control, a file called version.mk which defines OPUS_VERSION. The configure script reads that file and uses it as a fallback if the git revision isn't available. The expectation is that version.mk will be manually updated for releases, just as the previous configure.ac version was. However, since this is a simpler format, it is easier for alternate build systems to use, reducing the number of places which must be updated. Also removes the OPUS_MINOR_VERSION, etc. defines from config.h.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 224905df..431b72a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,8 @@ opus_custom_demo_SOURCES = celt/opus_custom_demo.c
opus_custom_demo_LDADD = libopus.la -lm
endif
-EXTRA_DIST = opus.pc.in \
+EXTRA_DIST = version.mk \
+ opus.pc.in \
opus-uninstalled.pc.in \
opus.sln \
celt/celt.vcxproj \