From 719c9febac2eaff9483fda487b57684afbb59bb2 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Wed, 05 Mar 2014 16:47:50 +0000 Subject: [PATCH] dont know --- src/Makefile.am | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index fe95642..30d71d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,25 @@ trisurfdir=../ -trisurf_PROGRAMS=trisurf -trisurf_SOURCES=general.c vertex.c main.c -trisurf_LDFLAGS = -lm -lconfuse -trisurf_CFLAGS = -Wall -g +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 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 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 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 +<<<<<<< HEAD +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 +neigh_testdir=../ +neigh_test_PROGRAMS = neigh_test +neigh_test_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 neigh_test.c + +======= +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 +>>>>>>> e9eab4fb2f72383a1a2adbe5f09f7bbd1fd45768 -- Gitblit v1.9.3