Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1071 from khotilov/make_fix

Browse Source 
fix Makefile to use MAKE variable
This commit is contained in:
Tianqi Chen 2016-03-30 23:22:21 -07:00
commit 714901eac5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -79,10 +79,10 @@ endif
all: lib/libxgboost.a $(XGBOOST_DYLIB) xgboost all: lib/libxgboost.a $(XGBOOST_DYLIB) xgboost
$(DMLC_CORE)/libdmlc.a: $(wildcard $(DMLC_CORE)/src/*.cc $(DMLC_CORE)/src/*/*.cc) $(DMLC_CORE)/libdmlc.a: $(wildcard $(DMLC_CORE)/src/*.cc $(DMLC_CORE)/src/*/*.cc)
+ cd $(DMLC_CORE); make libdmlc.a config=$(ROOTDIR)/$(config); cd $(ROOTDIR) + cd $(DMLC_CORE); $(MAKE) libdmlc.a config=$(ROOTDIR)/$(config); cd $(ROOTDIR)
$(RABIT)/lib/$(LIB_RABIT): $(wildcard $(RABIT)/src/*.cc) $(RABIT)/lib/$(LIB_RABIT): $(wildcard $(RABIT)/src/*.cc)
+ cd $(RABIT); make lib/$(LIB_RABIT); cd $(ROOTDIR) + cd $(RABIT); $(MAKE) lib/$(LIB_RABIT); cd $(ROOTDIR)
jvm: jvm-packages/lib/libxgboost4j.so jvm: jvm-packages/lib/libxgboost4j.so
@ -137,8 +137,8 @@ clean:
$(RM) -rf build build_plugin lib bin *~ */*~ */*/*~ */*/*/*~ */*.o */*/*.o */*/*/*.o xgboost $(RM) -rf build build_plugin lib bin *~ */*~ */*/*~ */*/*/*~ */*.o */*/*.o */*/*/*.o xgboost
clean_all: clean clean_all: clean
cd $(DMLC_CORE); make clean; cd $(ROODIR) cd $(DMLC_CORE); $(MAKE) clean; cd $(ROODIR)
cd $(RABIT); make clean; cd $(ROODIR) cd $(RABIT); $(MAKE) clean; cd $(ROODIR)
doxygen: doxygen:
doxygen doc/Doxyfile doxygen doc/Doxyfile
@ -150,7 +150,7 @@ pypack: ${XGBOOST_DYLIB}
# Script to make a clean installable R package. # Script to make a clean installable R package.
Rpack: Rpack:
make clean_all $(MAKE) clean_all
rm -rf xgboost xgboost*.tar.gz rm -rf xgboost xgboost*.tar.gz
cp -r R-package xgboost cp -r R-package xgboost
rm -rf xgboost/src/*.o xgboost/src/*.so xgboost/src/*.dll rm -rf xgboost/src/*.o xgboost/src/*.so xgboost/src/*.dll
@ -172,12 +172,12 @@ Rpack:
cp xgboost/src/Makevars xgboost/src/Makevars.win cp xgboost/src/Makevars xgboost/src/Makevars.win
Rbuild: Rbuild:
make Rpack $(MAKE) Rpack
R CMD build --no-build-vignettes xgboost R CMD build --no-build-vignettes xgboost
rm -rf xgboost rm -rf xgboost
Rcheck: Rcheck:
make Rbuild $(MAKE) Rbuild
R CMD check xgboost*.tar.gz R CMD check xgboost*.tar.gz
-include build/*.d -include build/*.d