From 9447bd5e078944df080b75e054cd4dc95c6c9303 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 22 Jun 2016 13:06:50 +0000
Subject: [PATCH] Merge with paraview's branch. Added triangles as cells for visualization

---
 src/Makefile.am |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f56d139..fb2c46b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
-bin_PROGRAMS = trisurf
+bin_PROGRAMS = trisurf tsmeasure
 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}
+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
@@ -17,5 +17,8 @@
 #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
 
+
+tsmeasure_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 tsmeasure.c poly.c stats.c sh.c shcomplex.c constvol.c snapshot.c restore.c
+tsmeasure_LDADD = ${libcurl_LIBS} ${libxml2_LIBS}
 #gitversion.c: .git/HEAD .git/index
 #    echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > $@

--
Gitblit v1.9.3