From e87e4e4fcbba57d36dfd17b92f413ccf2c1b322a Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Mon, 29 Feb 2016 08:20:59 +0000 Subject: [PATCH] Fixed restoration (partially) --- src/Makefile.am | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0e3fea8..f56d139 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,21 @@ -trisurfdir=../ -trisurf_PROGRAMS=trisurf -trisurf_SOURCES=general.c vertex.c bond.c main.c -trisurf_LDFLAGS = -lm -lconfuse -trisurf_CFLAGS = -Wall +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 +#co_testdir=../ +#co_test_PROGRAMS=co_test +#co_test_SOURCES= general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c energy.c sh.c co_test.c frame.c bondflip.c poly.c stats.c shcomplex.c +#spherical_trisurfdir=../ +#spherical_trisurf_PROGRAMS = spherical_trisurf +#spherical_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 spherical_trisurf.c sh.c bondflip.c poly.c stats.c shcomplex.c +#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