Commit 4107b184 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

link the handlerton to a version controlled libtokudb. merge -c 13578 from 2.1.0 to main. [t:1887]

git-svn-id: file:///svn/mysql/tokudb-engine/src@13590 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6d927e7a
...@@ -8,6 +8,7 @@ DEBUG = 1 ...@@ -8,6 +8,7 @@ DEBUG = 1
GCOV = 0 GCOV = 0
SINGLESO = 1 SINGLESO = 1
SYSTEM = $(shell uname -s | tr [A-Z] [a-z]) SYSTEM = $(shell uname -s | tr [A-Z] [a-z])
LIBTOKUDB=tokudb
# sources to target # sources to target
SRCS = $(wildcard *.cc) SRCS = $(wildcard *.cc)
...@@ -39,9 +40,9 @@ CXXFLAGS += -g $(OPTFLAGS) $(GCOV_FLAGS) $(MYSQL_CXXFLAGS) ...@@ -39,9 +40,9 @@ CXXFLAGS += -g $(OPTFLAGS) $(GCOV_FLAGS) $(MYSQL_CXXFLAGS)
CXXFLAGS += -fPIC CXXFLAGS += -fPIC
LDFLAGS = -fPIC -shared -Wl,-soname -Wl,libtokudb_engine.so LDFLAGS = -fPIC -shared -Wl,-soname -Wl,libtokudb_engine.so
ifeq ($(SINGLESO),1) ifeq ($(SINGLESO),1)
LIBS = $(TOKUDB)/src/ydb_lib.o $(TOKUDB)/lib/libtokudb.a $(TOKUDB)/lib/libtokuportability.a LIBS = $(TOKUDB)/src/ydb_lib.o $(TOKUDB)/lib/lib$(LIBTOKUDB).a $(TOKUDB)/lib/libtokuportability.a
else else
LIBS = -L$(TOKUDB)/lib -ltokudb -ltokuportability LIBS = -L$(TOKUDB)/lib -l$(LIBTOKUDB) -ltokuportability
endif endif
LIBS += -lpthread -lz -lm -lc LIBS += -lpthread -lz -lm -lc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment