[Genabel-commits] r1696 - pkg/ProbABEL/src

[noreply at r-forge.r-project.org]

Author: maartenk
Date: 2014-04-23 21:54:31 +0200 (Wed, 23 Apr 2014)
New Revision: 1696

Modified:
   pkg/ProbABEL/src/Makefile.am
Log:
eigen is not  option anymore in the make file 

Modified: pkg/ProbABEL/src/Makefile.am
===================================================================
--- pkg/ProbABEL/src/Makefile.am	2014-04-23 18:54:26 UTC (rev 1695)
+++ pkg/ProbABEL/src/Makefile.am	2014-04-23 19:54:31 UTC (rev 1696)
@@ -3,13 +3,12 @@
 ## Using wildcards in these lists doesn't work. Also GNU make's ($wildcard,) doesn't
 ## work. It gives warning message about portability, but in the end doesn't work,
 ## I tried :-).
-REGFILES = data.h data.cpp gendata.h gendata.cpp mematrix.h mematri1.h	\
+REGFILES = data.h data.cpp gendata.h gendata.cpp eigen_mematrix.h eigen_mematrix.cpp \
  command_line_settings.h command_line_settings.cpp reg1.h usage.h		\
  usage.cpp main.cpp utilities.h utilities.cpp phedata.h phedata.cpp	\
  cholesky.h cholesky.cpp regdata.h regdata.cpp  \
  maskedmatrix.cpp maskedmatrix.h reg1.cpp main_functions_dump.h main_functions_dump.cpp
 
-EIGENFILES = eigen_mematrix.h eigen_mematrix.cpp
 
 ## Filevector files:
 FVSRC = fvlib/AbstractMatrix.cpp fvlib/CastUtils.cpp			\
@@ -55,13 +54,11 @@
 palinear_CXXFLAGS = -DLINEAR $(AM_CXXFLAGS)
 palinear_CPPFLAGS = $(AM_CPPFLAGS)
 palinear_SOURCES += $(EIGENFILES)
-palinear_CXXFLAGS += -DEIGEN
 
 palogist_SOURCES = $(REGFILES) $(FVSRC) $(FVHEADERS)
 palogist_CXXFLAGS = -DLOGISTIC $(AM_CXXFLAGS)
 palogist_CPPFLAGS = $(AM_CPPFLAGS)
 palogist_SOURCES += $(EIGENFILES)
-palogist_CXXFLAGS += -DEIGEN
 
 pacoxph_SOURCES = $(COXSRC) $(REGFILES) $(FVSRC) $(FVHEADERS)	\
  $(RHEADERS) survS.h survproto.h coxph_data.h coxph_data.cpp
@@ -69,7 +66,6 @@
 pacoxph_CPPFLAGS = $(AM_CPPFLAGS)
 pacoxph_CFLAGS = -DCOXPH -I $(top_srcdir)/src/include $(AM_CFLAGS)
 pacoxph_SOURCES += $(EIGENFILES)
-pacoxph_CXXFLAGS += -DEIGEN
 
 extract_snp_SOURCES = extract-snp.cpp $(FVSRC) $(FVHEADERS)