Merge branch 'pkgconfig-fix'

ultravideo · Sep 15, 2015 · 5b3f2a6 · 5b3f2a6
2 parents f1ac0e6 + 4db06bc
commit 5b3f2a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -304,9 +304,10 @@ endif
 
 .PHONY: kvazaar.pc init_submodules install install-pc install-prog install-lib
 .PHONY: install-dylib install-dll clean
+kvazaar.pc: KVZ_VERSION = $(shell sed -n 's/^#define\s\+KVZ_VERSION\s\+\(.*\)/\1/ p' global.h)
 kvazaar.pc: kvazaar.pc.in Makefile
 	sed -e "s;@prefix@;$(PREFIX);" -e "s;@libdir@;$(LIBDIR);" \
-            -e "s;@VERSION@;$(VER_MAJOR).$(VER_MINOR).$(VER_RELEASE);" \
+            -e "s;@VERSION@;$(KVZ_VERSION);" \
             -e "s;@LIBS@;$(LIBS);" kvazaar.pc.in > $@
 
 init_submodules:

diff --git a/src/global.h b/src/global.h
@@ -137,7 +137,12 @@ typedef int16_t coeff_t;
 //#define SIGN3(x) ((x) > 0) ? +1 : ((x) == 0 ? 0 : -1)
 #define SIGN3(x) (((x) > 0) - ((x) < 0))
 
-#define VERSION_STRING "0.5.0"
+
+#define QUOTE(x) #x
+#define QUOTE_EXPAND(x) QUOTE(x)
+
+#define KVZ_VERSION 0.5.0
+#define VERSION_STRING QUOTE_EXPAND(KVZ_VERSION)
 
 //#define VERBOSE 1