show git version in output

diff --git a/Makefile b/Makefile
index 96ede561bacd00501a7f4801ee763c24b640ae61..c8e179f72d037e38dcaacd48cc7fa1528cbde0ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 CFLAGS += -Wall -Wwrite-strings -Wstrict-prototypes -g -O2 -std=gnu99
+CPPFLAGS += -DVERSION="\"`git-describe --tags --dirty=+`\""
 LC_CTYPE=C
 LDLIBS = -lpub -lglpk -lm
 

diff --git a/main.c b/main.c
index b02e98cbda4beae56f0592e10997bc7ef854ed6e..3fa6ad3a0257d7087de5fe39a88bd665e59b00d2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -42,6 +42,10 @@
 
 #include <glpk.h>
 
+#ifndef VERSION
+#define VERSION "(unknown-version)"
+#endif
+
 /*
  * Algorithm.
  *
@@ -651,7 +655,7 @@ static void report(void) {
         continue;
       a[x][y] = min + glp_get_col_prim(best_prob, i);
     }
-    printf("%d into %d: min fragment %g\n", n, m, min);
+    printf("%d into %d: min fragment %g   [%s]\n", n, m, min, VERSION);
     for (i = 0; i < n; i++) {
       for (j = 0; j < m; j++) {
         if (a[i][j])