Commit 90f705de authored by Damien Leroux's avatar Damien Leroux
Browse files

Fixed ugly problem with compilation of external sources.

The subtree for the .o was not created prior to compiling.
parent 704b30cb
GCC_VERSION=-4.9
CXX=g++$(GCC_VERSION)
CXXARGS=--std=gnu++0x -Wall -Wno-unused-local-typedefs -DEIGEN_NO_DEPRECATED_WARNING -pthread
CXXARGS=--std=gnu++0x -Wall -Wno-unused-local-typedefs -DEIGEN_NO_DEPRECATED_WARNING -pthread -DSPELL_UNSAFE_OUTPUT
COV=gcov$(GCC_VERSION)
INC=-I../include -I../include/input -I/usr/local/include/eigen3
LD=$(CXX)
......@@ -9,15 +9,15 @@ VERSION_DEFINES=$(shell git tag | sed 's/\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)/-D
C=$(CXX) $(CXXARGS) $(INC) -DTEST_POLY $(VERSION_DEFINES)
SRC=main.cc cache.cc fast_polynom.cc markov_population.cc ril_properties.cc frag_comp.cc
EXT_SRC=../src/input/read_map.cc ../src/input/read_mark.cc ../src/input/read_trait.cc ../src/outbred.cc ../src/probapop_dtd.cc ../src/input/invoke_probapop.cc ../src/static_data.cc ../src/input/read_settings.cc ../src/input/xml/xml_design.cc ../src/input/xml/xml_format.cc ../src/input/xml/xml_settings.cc ../src/input/ld_matrices.cc ../src/input/pedigree.cc ../src/computations/basic_data.cc
SRC=main.cc cache.cc fast_polynom.cc markov_population.cc ril_properties.cc frag_comp.cc model_manager.cc
EXT_SRC=../src/input/read_map.cc ../src/input/read_mark.cc ../src/input/read_trait.cc ../src/outbred.cc ../src/probapop_dtd.cc ../src/input/invoke_probapop.cc ../src/static_data.cc ../src/input/read_settings.cc ../src/input/xml/xml_design.cc ../src/input/xml/xml_format.cc ../src/input/xml/xml_settings.cc ../src/input/ld_matrices.cc ../src/input/pedigree.cc ../src/computations/basic_data.cc ../src/computations/probabilities.cc ../src/computations/model.cc ../src/beta_gamma.cc
#SRC=main.cc fast_polynom.cc ril_properties.cc ../src/input/read_map.cc ../src/outbred.cc ../src/probapop_dtd.cc ../src/input/invoke_probapop.cc ../src/static_data.cc
OBJ=$(subst .cc,.o,$(SRC))
EXT_OBJ=$(subst ../,,$(subst .cc,.o,$(EXT_SRC)))
DEBUG_OPTS=-ggdb
OPT_OPTS=-O3 -DEIGEN_NO_DEBUG -DNDEBUG
DEBUG_OPTS=-ggdb -DNDEBUG
#OPT_OPTS=-O3 -DEIGEN_NO_DEBUG -DNDEBUG
#COV_OPTS=-g -fprofile-arcs -ftest-coverage
COV_OPTS=$(DEBUG_OPTS) --coverage
......@@ -65,6 +65,7 @@ $(OBJ):%.o: %.cc $(PCH)
$C -c $< -o $@
$(EXT_OBJ):%.o: ../%.cc $(PCH)
-mkdir -p `dirname $@`
$C -c $< -o $@
clean:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment