From ff8152b46e7957beffeafca580abc90df47d9d28 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Fri, 21 Mar 2014 21:15:31 +0000 Subject: [PATCH] Merge branch 'trisurf-polyel' --- src/Makefile.am | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a6e0171..e899cd3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +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 bondflip.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 poly.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 +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 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 +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 +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 +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 -- Gitblit v1.9.3