From 1612e2c57bcb82099ba2b808835fbd321aa72402 Mon Sep 17 00:00:00 2001 From: Dariusz Murakowski Date: Wed, 17 Jun 2015 13:48:32 -0400 Subject: [PATCH] Make only `wf` (Wright-Fisher code). --- Makefile | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 18565ba..e90ff84 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,9 @@ SRCS_WF = wf.cpp hamiltonian.cpp population.cpp virus.cpp EXECNAME_WF = wf -SRCS_MC = mc.cpp hamiltonian.cpp population.cpp virus.cpp -EXECNAME_MC = mc - -SRCS_SS = ss.cpp ham_ss.cpp pop_ss.cpp reaction.cpp seqTools.cpp -EXECNAME_SS = ss - CXX = c++ -CFLAGS = -std=c++0x $(DBGFLAG) -Wall -Wextra -pedantic -Wno-unused-parameter +CFLAGS = $(DBGFLAG) -Wall -Wextra -pedantic -Wno-unused-parameter INCLUDEDIR = # -I/usr/local/pkg/gsl/gsl-1.15/include # = `gsl-config --cflags` LIBDIR = # -L/usr/local/pkg/gsl/gsl-1.15/lib @@ -19,12 +13,11 @@ LIBS = -lgsl -lgslcblas -lm # = `gsl-config --libs` ifeq ($(dbg),1) - DBGFLAG = -g -DDEBUG # -D_GLIBCXX_DEBUG + DBGFLAG = -g -DDEBUG # -D_GLIBCXX_DEBUG else DBGFLAG = -O3 -combine -DHAVE_INLINE endif -# now the actual build rules, pretty general .PHONY: clean @@ -34,24 +27,6 @@ all: $(EXECNAME_WF) $(EXECNAME_MC) $(EXECNAME_SS) $(EXECNAME_WF): $(SRCS_WF) $(SRCS_WF:%.cpp=%.h) Makefile $(CXX) $(SRCS_WF) $(CFLAGS) $(LIBDIR) $(INCLUDEDIR) -o $(EXECNAME_WF) $(LIBS) -$(EXECNAME_MC): $(SRCS_MC) $(SRCS_MC:%.cpp=%.h) Makefile - $(CXX) $(SRCS_MC) $(CFLAGS) $(LIBDIR) $(INCLUDEDIR) -o $(EXECNAME_MC) $(LIBS) - -$(EXECNAME_SS): $(SRCS_SS) $(SRCS_SS:%.cpp=%.h) Makefile - $(CXX) $(SRCS_SS) $(CFLAGS) $(LIBDIR) $(INCLUDEDIR) -o $(EXECNAME_SS) $(LIBS) - -# concatenate all the source files before compiling -# ./concat.sh $(EXECNAME) $(SRCS) -# $(CXX) -x c++ $(EXECNAME).combined $(CFLAGS) $(LIBDIR) $(INCLUDEDIR) -o $(EXECNAME) $(LIBS) - -# $(CXX) $(SRCS) $(CFLAGS) $(LFLAGS) $(INCLUDES) $(LIBS) -o $(EXECNAME) -# $(CXX) $(CFLAGS) $(INCLUDES) -o $(EXECNAME) $(OBJS) $(LFLAGS) $(LIBS) - -# equivalent way using 'old-fashioned suffix rules' would be .c.o: -#%.o: %.cpp -# $(CXX) -c $(CFLAGS) $(INCLUDES) $< -o $@ - clean: - $(RM) *.o $(EXECNAME_WF) $(EXECNAME_MC) $(EXECNAME_SS) -# $(RM) *.o *.combined $(EXECNAME) + $(RM) *.o $(EXECNAME_WF) -- 2.7.4