From 51b4f09bca802c4941700c78c5733ce968ddc7c6 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Wed, 27 Feb 2019 22:44:22 +0000 Subject: [PATCH] An attempt of adding hard constraints plugin to the simulator. It seems it does not work yet --- src/Makefile.am | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 024f250..74a6947 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,23 @@ -trisurfdir=../ -trisurf_PROGRAMS=trisurf -trisurf_SOURCES=general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c main.c -trisurf_LDFLAGS = -lm -lconfuse -trisurf_CFLAGS = -Wall -Werror +bin_PROGRAMS = trisurf tsmeasure tspoststat +trisurf_SOURCES = main.c +GITVERSION:=$(shell git --no-pager describe --tags --always --dirty) +AM_CFLAGS = -Wall -Werror -DTS_VERSION=\"$(GITVERSION)\" -fgnu89-inline -Wno-error=date-time +AM_CPPFLAGS = ${libxml2_CFLAGS} -fgnu89-inline +trisurf_LDADD = libtrisurf.la ${libcurl_LIBS} ${libxml2_LIBS} + +tsmeasure_SOURCES = tsmeasure.c +tsmeasure_LDADD = libtrisurf.la ${libcurl_LIBS} ${libxml2_LIBS} + +tspoststat_SOURCES = tspoststat.c +tspoststat_LDADD = libtrisurf.la ${libcurl_LIBS} ${libxml2_LIBS} + +#------------- LIBS ---------- + +lib_LTLIBRARIES= libtrisurf.la +libtrisurf_la_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 poly.c stats.c sh.c shcomplex.c constvol.c snapshot.c restore.c cluster.c plugins.c +#libtrisurf_la_CPPFLAGS = ${libxml2_CFLAGS} +libtrisurf_la_LIBADD=${libxml2_LIBS} +pkginclude_HEADERS=general.h vertex.h bond.h triangle.h cell.h vesicle.h initial_distribution.h io.h dumpstate.h frame.h energy.h timestep.h vertexmove.h bondflip.h poly.h stats.h sh.h shcomplex.h constvol.h snapshot.h restore.h cluster.h plugins.h +#demoplugin_la_SOURCES= plugins/demo_plugin.c +#demoplugin_la_LDFLAGS = -module -avoid-version -export-dynamic +SUBDIRS=plugins -- Gitblit v1.9.3