hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zg...@apache.org
Subject [hbase] 126/133: HBASE-18727 [C++] Don't link JNI/JVM stuff into libHbaseClient
Date Tue, 12 Mar 2019 12:46:54 GMT
This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch HBASE-14850
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit d56e830249ecfdd3360ba75964aa0b98ec7a6b9a
Author: Enis Soztutar <enis@apache.org>
AuthorDate: Thu Sep 14 12:27:45 2017 -0700

    HBASE-18727 [C++] Don't link JNI/JVM stuff into libHbaseClient
---
 hbase-native-client/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hbase-native-client/Makefile b/hbase-native-client/Makefile
index c879f98..a291dfa 100644
--- a/hbase-native-client/Makefile
+++ b/hbase-native-client/Makefile
@@ -24,21 +24,25 @@ DEBUG_PATH := $(BUILD_PATH)/debug
 RELEASE_PATH := $(BUILD_PATH)/release
 PROTO_SRC_DIR := if
 PROTO_CXX_DIR := $(BUILD_PATH)/if
-MODULES := connection core exceptions security serde test-util utils
+MODULES := connection core exceptions security serde utils
+TEST_MODULES := test-util # These modules contain test code, not included in the build for
the lib
 SRC_DIR := $(MODULES)
 DEBUG_BUILD_DIR := $(addprefix $(DEBUG_PATH)/,$(MODULES))
 RELEASE_BUILD_DIR := $(addprefix $(RELEASE_PATH)/,$(MODULES))
-INCLUDE_DIR := . $(BUILD_PATH) $(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux
+INCLUDE_DIR := . $(BUILD_PATH)
+TEST_BUILD_INCLUDE_DIR := $(INLCUDE_DIR) $(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux
 
 #flags to pass to the CPP compiler & linker
 CPPFLAGS_DEBUG := -D_GLIBCXX_USE_CXX11_ABI=0 -g -Wall -std=c++14 -pedantic -fPIC -MMD -MP
 CPPFLAGS_RELEASE := -D_GLIBCXX_USE_CXX11_ABI=0 -DNDEBUG -O2 -Wall -std=c++14 -pedantic -fPIC
-MMD -MP
-LDFLAGS := -lprotobuf -lzookeeper_mt -lsasl2 -lfolly -lwangle -L $(JAVA_HOME)/jre/lib/amd64/server
-ljvm
+LDFLAGS := -lprotobuf -lzookeeper_mt -lsasl2 -lfolly -lwangle
+TEST_BUILD_LDFLAGS := $(LDFLAGS) -L $(JAVA_HOME)/jre/lib/amd64/server -ljvm
 LINKFLAG := -shared
 
 #define list of source files and object files
 ALLSRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cc))
-EXCLUDE_SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*-test.cc)) core/simple-client.cc
core/load-client.cc
+EXCLUDE_SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*-test.cc)) \
+	core/simple-client.cc core/load-client.cc
 SRC := $(filter-out $(EXCLUDE_SRC), $(ALLSRC))
 PROTOSRC := $(patsubst %.proto, $(addprefix $(BUILD_PATH)/,%.pb.cc),$(wildcard if/*.proto))
 PROTOHDR := $(patsubst %.proto, $(addprefix $(BUILD_PATH)/,%.pb.h),$(wildcard if/*.proto))


Mime
View raw message