makefile compatible with soft link terark-core lib compile method version 2

40e89a85 · chenchanglong · 047d70a8 · 40e89a85 · 40e89a85
显示空白变更内容
内联并排

Showing with 3 addition and 0 deletion

.gitignore .gitignore +1 -0

Makefile Makefile +2 -0

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@ buckifier/*.pyc
 vs2017
 /msvc14/build_version.dir
 /msvc14
+/terark-core
 terark-core.got

 cmake-build-debug

--- a/Makefile
+++ b/Makefile
@@ -459,7 +459,9 @@ endif
 LIBOBJECTS = $(addprefix ${xdir}/, $(LIB_SOURCES:.cc=.o))
 LIB_CC_OBJECTS = $(LIBOBJECTS)

+ifeq (${TERARK_CORE_HOME},terark-core)
 ${LIB_SOURCES} ${LIB_SOURCES:.cc=.o} : terark-core.got
+endif

 ifeq ($(HAVE_POWER8),1)
 LIBOBJECTS += $(addprefix ${xdir}/, $(LIB_SOURCES_C:.c=.o))