Commit 7043893b authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

automake the tokudb handlerton refs[t:2474]

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@18780 c7de825b-a66e-492c-adef-691d508d4ae1
parent adcd2b01
...@@ -4,13 +4,12 @@ MYSQLDATAdir = $(localstatedir) ...@@ -4,13 +4,12 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
TOKUDBdir= $(top_builddir)/../tokudb/release
INCLUDES = -I$(top_builddir)/include \ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
-I$(srcdir) \ -I$(srcdir) \
-I$(TOKUDBdir)/include -I$(TOKUFRACTALTREE)/include
LDADD = LDADD =
DEFS = @DEFS@ DEFS = @DEFS@
...@@ -18,15 +17,15 @@ noinst_HEADERS = ...@@ -18,15 +17,15 @@ noinst_HEADERS =
EXTRA_LTLIBRARIES = ha_tokudb.la EXTRA_LTLIBRARIES = ha_tokudb.la
pkglib_LTLIBRARIES = @plugin_tokudb_shared_target@ pkglib_LTLIBRARIES = @plugin_tokudb_shared_target@
ha_tokudb_la_LIBADD = -L$(TOKUDBdir)/lib -ltokudb -ltokuportability ha_tokudb_la_LIBADD = -L$(TOKUFRACTALTREE)/lib -ltokudb -ltokuportability
ha_tokudb_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) ha_tokudb_la_LDFLAGS = -module -rpath $(pkglibdir)/plugin
ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN
ha_tokudb_la_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc ha_tokudb_la_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
#EXTRA_LIBRARIES = libtokudb.a EXTRA_LIBRARIES = libtokudb.a
#noinst_LIBRARIES = @plugin_tokudb_static_target@ noinst_LIBRARIES = @plugin_tokudb_static_target@
#libtokudb_a_CXXFLAGS = $(AM_CFLAGS) libtokudb_a_CXXFLAGS = $(AM_CFLAGS)
#libtokudb_a_SOURCES = ha_tokudb.cc libtokudb_a_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
......
This diff is collapsed.
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