From 737e1c8236e7e9b72cf08c5d173e0a307c38600c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 10 Jul 2012 12:34:47 +0000
Subject: [PATCH] Merge branch 'bondflip'

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 66eec22..e61ecec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +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_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
 #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
+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
+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
+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

--
Gitblit v1.9.3