From a662340fda5630e58e0575d149ae91e2018a284b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=AD=90=E8=BD=A9?= <huangzixuan@p5w.net>
Date: Mon, 11 Jan 2016 18:16:02 -0800
Subject: [PATCH] modify java wrapper settings for new refactor

---
 Makefile                   | 12 ++++++++++++
 java/xgboost4j_wrapper.cpp |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1eecdf046..0243ff553 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ endif
 export LDFLAGS= -pthread -lm $(ADD_LDFLAGS) $(DMLC_LDFLAGS)
 export CFLAGS=  -std=c++0x -Wall -O3 -msse2  -Wno-unknown-pragmas -funroll-loops -fPIC -Iinclude $(ADD_CFLAGS)
 CFLAGS += -I$(DMLC_CORE)/include -I$(RABIT)/include
+#java include path
+export JAVAINCFLAGS = -I${JAVA_HOME}/include -I./java
 
 ifndef LINT_LANG
 	LINT_LANG= "all"
@@ -46,6 +48,11 @@ endif
 
 ifeq ($(UNAME), Linux)
 	LDFLAGS += -lrt
+	JAVAINCFLAGS += -I${JAVA_HOME}/include/linux
+endif
+
+ifeq ($(UNAME), Darwin)
+	JAVAINCFLAGS += -I${JAVA_HOME}/include/darwin
 endif
 
 ifeq ($(USE_OPENMP), 1)
@@ -54,6 +61,7 @@ else
 	CFLAGS += -DDISABLE_OPENMP
 endif
 
+
 # specify tensor path
 .PHONY: clean all lint clean_all rcpplint Rpack Rbuild Rcheck
 
@@ -65,6 +73,7 @@ $(DMLC_CORE)/libdmlc.a:
 $(RABIT)/lib/$(LIB_RABIT):
 	+ cd $(RABIT); make lib/$(LIB_RABIT); cd $(ROOTDIR)
 
+java: java/libxgboost4j.so
 
 SRC = $(wildcard src/*.cc src/*/*.cc)
 ALL_OBJ = $(patsubst src/%.cc, build/%.o, $(SRC))
@@ -95,6 +104,9 @@ lib/libxgboost.so: $(ALL_DEP)
 	@mkdir -p $(@D)
 	$(CXX) $(CFLAGS) -shared -o $@ $(filter %.o %.a, $^) $(LDFLAGS)
 
+java/libxgboost4j.so: java/xgboost4j_wrapper.cpp lib/libxgboost.a $(LIB_DEP)
+	$(CXX) $(CFLAGS) $(JAVAINCFLAGS) -shared -o $@ $(filter %.cpp %.o %.a, $^) $(LDFLAGS)
+
 xgboost: $(CLI_OBJ) lib/libxgboost.a $(LIB_DEP)
 	$(CXX) $(CFLAGS) -o $@  $(filter %.o %.a, $^)  $(LDFLAGS)
 
diff --git a/java/xgboost4j_wrapper.cpp b/java/xgboost4j_wrapper.cpp
index d8ba5fb9b..865426752 100644
--- a/java/xgboost4j_wrapper.cpp
+++ b/java/xgboost4j_wrapper.cpp
@@ -12,7 +12,7 @@
  limitations under the License.
  */
 
-#include "../wrapper/xgboost_wrapper.h"
+#include "xgboost/c_api.h"
 #include "xgboost4j_wrapper.h"
 #include <cstring>