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

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

Author: lckarssen
Date: 2014-11-07 14:39:52 +0100 (Fri, 07 Nov 2014)
New Revision: 1884

Modified:
   pkg/ProbABEL/src/Makefile.am
Log:
Also apply the correct use of CPPFLAGS (instead of CXXFLAGS) for -D options in ProbABEL's src/Makefile.am.

Follow up of r1882.


Modified: pkg/ProbABEL/src/Makefile.am
===================================================================
--- pkg/ProbABEL/src/Makefile.am	2014-11-07 12:25:55 UTC (rev 1883)
+++ pkg/ProbABEL/src/Makefile.am	2014-11-07 13:39:52 UTC (rev 1884)
@@ -59,20 +59,18 @@
 
 
 palinear_SOURCES = $(REGFILES) $(FVSRC) $(FVHEADERS)
-palinear_CXXFLAGS = -DLINEAR $(AM_CXXFLAGS)
-palinear_CPPFLAGS = $(AM_CPPFLAGS)
+palinear_CPPFLAGS = -DLINEAR $(AM_CPPFLAGS)
 palinear_SOURCES += $(EIGENFILES)
 
 palogist_SOURCES = $(REGFILES) $(FVSRC) $(FVHEADERS)
-palogist_CXXFLAGS = -DLOGISTIC $(AM_CXXFLAGS)
-palogist_CPPFLAGS = $(AM_CPPFLAGS)
+palogist_CPPFLAGS = -DLOGISTIC $(AM_CPPFLAGS)
 palogist_SOURCES += $(EIGENFILES)
 
 pacoxph_SOURCES = $(COXSRC) $(REGFILES) $(FVSRC) $(FVHEADERS)	\
  $(RHEADERS) survS.h survproto.h coxph_data.h coxph_data.cpp
-pacoxph_CXXFLAGS = -DCOXPH -I $(top_srcdir)/src/include $(AM_CXXFLAGS)
-pacoxph_CPPFLAGS = $(AM_CPPFLAGS)
-pacoxph_CFLAGS = -DCOXPH -I $(top_srcdir)/src/include $(AM_CFLAGS)
+pacoxph_CXXFLAGS = -I $(top_srcdir)/src/include $(AM_CXXFLAGS)
+pacoxph_CPPFLAGS = -DCOXPH $(AM_CPPFLAGS)
+pacoxph_CFLAGS = -I $(top_srcdir)/src/include $(AM_CFLAGS)
 pacoxph_SOURCES += $(EIGENFILES)
 
 extract_snp_SOURCES = extract-snp.cpp $(FVSRC) $(FVHEADERS)