From 7a11a7a2a7d6b2b4b7ad285a1a7cddab44040a46 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Fri, 06 May 2016 11:05:18 +0000
Subject: [PATCH] Fixed handling of inline functions with newr versions of gcc. Added -fgnu89-inline flag into gcc compiler line.
---
src/Makefile.am | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 120a518..dde990e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
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
-AM_CFLAGS = -Wall -Werror
-AM_CPPFLAGS = ${libxml2_CFLAGS}
+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)\" -fgnu89-inline
+AM_CPPFLAGS = ${libxml2_CFLAGS} -fgnu89-inline
trisurf_LDADD = ${libcurl_LIBS} ${libxml2_LIBS}
#shdiscoverdir=../
#shdiscover_PROGRAMS= shdiscover
@@ -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