From 3096998157b37ad4d6c1af9ce32e657407795d5d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 07 Jun 2012 13:43:50 +0000
Subject: [PATCH] Merge branch 'Ylmi2sh'

---
 src/Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b2da64f..66eec22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,8 @@
 trisurfdir=../
-trisurf_PROGRAMS=trisurf
-trisurf_SOURCES=general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c main.c
-trisurf_LDFLAGS = -lm -lconfuse
-trisurf_CFLAGS = -Wall -Werror
+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
+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
+AM_CFLAGS = -Wall -Werror

--
Gitblit v1.9.3