From e297565ae34d6cc62f41810a261adbeef576af7b Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Tue, 16 Feb 2016 15:42:49 +0000 Subject: [PATCH] Changed the way the information on the version is inserted into the code --- src/Makefile.am | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b81035d..4517cb2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,9 @@ bin_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 constvol.c -AM_CFLAGS = -Wall -Werror +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 +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 @@ -13,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