From 9d5216497310cf33ef3db2d511787a779ebccda3 Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Tue, 08 Jul 2014 16:27:32 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 25fc76f..831e39f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,17 @@
 trisurfdir=../
 trisurf_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 main.c
-trisurf_LDFLAGS = -lm -lconfuse
-trisurf_CFLAGS = -Wall -Werror
+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_LDFLAGS = -lm -lconfuse
+#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

--
Gitblit v1.9.3