From a99f2bb2d3af25b4cc14848647522c1997862652 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 03 Mar 2016 16:22:23 +0000
Subject: [PATCH] Fix
---
src/Makefile.am | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 20bae62..f56d139 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
-trisurfdir=../
-trisurf_PROGRAMS = trisurf
-trisurf_SOURCES = general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c frame.c energy.c timestep.c vertexmove.c bondflip.c main.c poly.c stats.c sh.c shcomplex.c
-AM_CFLAGS = -Wall -Werror
-#trisurf_LDFLAGS = -lm -lconfuse
+bin_PROGRAMS = trisurf
+trisurf_SOURCES = general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c dumpstate.c frame.c energy.c timestep.c vertexmove.c bondflip.c main.c poly.c stats.c sh.c shcomplex.c constvol.c snapshot.c restore.c
+GITVERSION:=$(shell git --no-pager describe --tags --always --dirty)
+AM_CFLAGS = -Wall -Werror -DTS_VERSION=\"$(GITVERSION)\"
+AM_CPPFLAGS = ${libxml2_CFLAGS}
+trisurf_LDADD = ${libcurl_LIBS} ${libxml2_LIBS}
#shdiscoverdir=../
#shdiscover_PROGRAMS= shdiscover
#shdiscover_SOURCES= general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c energy.c sh.c shdiscover.c poly.c stats.c shcomplex.c
@@ -15,3 +16,6 @@
#spherical_trisurf_ffdir=../
#spherical_trisurf_ff_PROGRAMS = spherical_trisurf_ff
#spherical_trisurf_ff_SOURCES = general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c frame.c energy.c timestep.c vertexmove.c spherical_trisurf_ff.c sh.c bondflip.c poly.c stats.c shcomplex.c
+
+#gitversion.c: .git/HEAD .git/index
+# echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > $@
--
Gitblit v1.9.3