From fabe2f39e26512345666e82381dd51fcd8317088 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Sun, 31 Aug 2014 08:36:17 -0700
Subject: [PATCH] more clean makefile

---
 R-package/src/Makevars     | 13 +++++--------
 R-package/src/Makevars.win | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/R-package/src/Makevars b/R-package/src/Makevars
index 8569a802e..995dc4379 100644
--- a/R-package/src/Makevars
+++ b/R-package/src/Makevars
@@ -1,17 +1,14 @@
 # package root
 PKGROOT=../../
 # _*_ mode: Makefile; _*_
-CXX=`R CMD config CXX`
-TCFLAGS=`R CMD config CFLAGS` 
+CXX=`"${R_HOME}/bin/R" CMD config CXX`
+CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
+CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
 # expose these flags to R CMD SHLIB
 PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_MSG_ -I$(PKGROOT)  $(SHLIB_OPENMP_CFLAGS)
-XGBFLAG= $(TCFLAGS) -DXGBOOST_CUSTOMIZE_MSG_ -fPIC  $(SHLIB_OPENMP_CFLAGS)
+XGBFLAG= $(CXXFLAGS) -DXGBOOST_CUSTOMIZE_MSG_ -fPIC  $(SHLIB_OPENMP_CFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
 
-ifeq ($(no_omp),1)
-	PKG_CPPFLAGS += -DDISABLE_OPENMP 
-endif
-
 CXXOBJ= xgboost_wrapper.o xgboost_io.o xgboost_gbm.o xgboost_updater.o
 OBJECTS= xgboost_R.o $(CXXOBJ)
 
@@ -25,7 +22,7 @@ xgboost_gbm.o: $(PKGROOT)/src/gbm/gbm.cpp
 xgboost_updater.o: $(PKGROOT)/src/tree/updater.cpp
 
 $(CXXOBJ) :
-	$(CXX) -c $(XGBFLAG) -o $@ $(firstword $(filter %.cpp %.c, $^) )
+	$(CXX) -c $(XGBFLAG) -o $@ $+
 
 clean:
 	rm -rf *.so *.o *~ *.dll
diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win
index 391c9b6d9..e4bd42d37 100644
--- a/R-package/src/Makevars.win
+++ b/R-package/src/Makevars.win
@@ -1,17 +1,14 @@
 # package root
 PKGROOT=../../
 # _*_ mode: Makefile; _*_
-CXX=`Rcmd config CXX`
-TCFLAGS=`Rcmd config CFLAGS` 
+CXX=`"${R_HOME}/bin/Rcmd" config CXX`
+CFLAGS=`"${R_HOME}/bin/Rcmd" config CFLAGS`
+CXXFLAGS=`"${R_HOME}/bin/Rcmd" config CXXFLAGS`
 # expose these flags to R CMD SHLIB
 PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_MSG_ -I$(PKGROOT)  $(SHLIB_OPENMP_CFLAGS)
-XGBFLAG= -O3 -DXGBOOST_CUSTOMIZE_MSG_ -fPIC  $(SHLIB_OPENMP_CFLAGS)
+XGBFLAG= $(CXXFLAGS) -DXGBOOST_CUSTOMIZE_MSG_ -fPIC  $(SHLIB_OPENMP_CFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
 
-ifeq ($(no_omp),1)
-	PKG_CPPFLAGS += -DDISABLE_OPENMP 
-endif
-
 CXXOBJ= xgboost_wrapper.o xgboost_io.o xgboost_gbm.o xgboost_updater.o
 OBJECTS= xgboost_R.o $(CXXOBJ)
 
@@ -25,7 +22,7 @@ xgboost_gbm.o: $(PKGROOT)/src/gbm/gbm.cpp
 xgboost_updater.o: $(PKGROOT)/src/tree/updater.cpp
 
 $(CXXOBJ) :
-	$(CXX) -c $(XGBFLAG) -o $@ $(firstword $(filter %.cpp %.c, $^) )
+	$(CXX) -c $(XGBFLAG) -o $@ $+
 
 clean:
 	rm -rf *.so *.o *~ *.dll