Commit e1e48d82 authored by Paul McCullagh's avatar Paul McCullagh

Corrected automake

parents a61584ad 6120cc96
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* my_global.h may define SAFEMALLOC (through my_config.h). */
#include <my_global.h>
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */ #ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
#undef SAFEMALLOC #undef SAFEMALLOC
#endif #endif
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
/* Not MT-SAFE */ /* Not MT-SAFE */
/* my_global.h may define SAFEMALLOC (through my_config.h). */
#include <my_global.h>
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */ #ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
#undef SAFEMALLOC #undef SAFEMALLOC
#endif #endif
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* my_global.h may define SAFEMALLOC (through my_config.h). */
#include <my_global.h>
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */ #ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
#undef SAFEMALLOC #undef SAFEMALLOC
#endif #endif
......
DRIZZLE_STORAGE_ENGINE(pbxt,no, [PBXT Storage Engine], MYSQL_STORAGE_ENGINE(pbxt,no, [PBXT Storage Engine],
[MVCC-based transactional engine], [max,max-no-ndb]) [MVCC-based transactional engine], [max,max-no-ndb])
DRIZZLE_PLUGIN_DIRECTORY(pbxt, [storage/pbxt]) MYSQL_PLUGIN_DIRECTORY(pbxt, [storage/pbxt])
DRIZZLE_PLUGIN_STATIC(pbxt, [src/libpbxt.a]) MYSQL_PLUGIN_STATIC(pbxt, [src/libpbxt.a])
DRIZZLE_PLUGIN_MANDATORY(pbxt) dnl Default MYSQL_PLUGIN_ACTIONS(pbxt, [
DRIZZLE_PLUGIN_ACTIONS(pbxt, [
AC_CONFIG_FILES(storage/pbxt/src/Makefile) AC_CONFIG_FILES(storage/pbxt/src/Makefile)
]) ])
# Used to build Makefile.in
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
AM_CPPFLAGS = -I$(top_srcdir)/../../
LIBS =
LDADD =
noinst_HEADERS = bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \
datadic_xt.h datalog_xt.h filesys_xt.h hashtab_xt.h \
ha_pbxt.h heap_xt.h index_xt.h linklist_xt.h \
memory_xt.h myxt_xt.h pthread_xt.h restart_xt.h \
streaming_xt.h sortedlist_xt.h strutil_xt.h \
tabcache_xt.h table_xt.h trace_xt.h thread_xt.h \
util_xt.h xaction_xt.h xactlog_xt.h lock_xt.h \
systab_xt.h ha_xtsys.h discover_xt.h \
mybs.h xt_config.h xt_defs.h xt_errno.h
EXTRA_LTLIBRARIES = libpbxt.la
libpbxt_la_SOURCES = bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \
datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \
ha_pbxt.cc heap_xt.cc index_xt.cc linklist_xt.cc \
memory_xt.cc myxt_xt.cc pthread_xt.cc restart_xt.cc \
streaming_xt.cc sortedlist_xt.cc strutil_xt.cc \
tabcache_xt.cc table_xt.cc trace_xt.cc thread_xt.cc \
systab_xt.cc ha_xtsys.cc discover_xt.cc \
util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc
libpbxt_la_LDFLAGS = -module
# These are the warning Drizzle uses:
# DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter
libpbxt_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
libpbxt_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
EXTRA_LIBRARIES = libpbxt.a
noinst_LIBRARIES = libpbxt.a
libpbxt_a_SOURCES = $(libpbxt_la_SOURCES)
libpbxt_a_CXXFLAGS = $(AM_CFLAGS) -DDRIZZLED -Wno-long-long
libpbxt_a_CFLAGS = $(AM_CFLAGS) -DDRIZZLED -std=c99
EXTRA_DIST = CMakeLists.txt
# Used to build Makefile.in # Used to build Makefile.in
INCLUDES = $(ENG_MYSQL_INC) MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \
-I$(top_srcdir)/storage/innobase/include \
-I$(top_srcdir)/sql \
-I$(srcdir)
LIBS = LIBS =
LDADD = LDADD =
plugindir = $(ENG_PLUGIN_DIR)
noinst_HEADERS = bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \ noinst_HEADERS = bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \
datadic_xt.h datalog_xt.h filesys_xt.h hashtab_xt.h \ datadic_xt.h datalog_xt.h filesys_xt.h hashtab_xt.h \
ha_pbxt.h heap_xt.h index_xt.h linklist_xt.h \ ha_pbxt.h heap_xt.h index_xt.h linklist_xt.h \
...@@ -17,8 +24,7 @@ noinst_HEADERS = bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \ ...@@ -17,8 +24,7 @@ noinst_HEADERS = bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \
util_xt.h xaction_xt.h xactlog_xt.h lock_xt.h \ util_xt.h xaction_xt.h xactlog_xt.h lock_xt.h \
systab_xt.h ha_xtsys.h discover_xt.h \ systab_xt.h ha_xtsys.h discover_xt.h \
pbms.h xt_config.h xt_defs.h xt_errno.h locklist_xt.h pbms.h xt_config.h xt_defs.h xt_errno.h locklist_xt.h
EXTRA_LTLIBRARIES = libpbxt.la
plugin_LTLIBRARIES = libpbxt.la
libpbxt_la_SOURCES = bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \ libpbxt_la_SOURCES = bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \
datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \ datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \
...@@ -31,21 +37,16 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \ ...@@ -31,21 +37,16 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \
libpbxt_la_LDFLAGS = -module libpbxt_la_LDFLAGS = -module
# These are the warnings Drizzle uses: # These are the warning Drizzle uses:
# DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter # DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter
libpbxt_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN libpbxt_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
libpbxt_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99 libpbxt_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
EXTRA_LIBRARIES = libpbxt.a libxtutil.a EXTRA_LIBRARIES = libpbxt.a
noinst_LIBRARIES = libpbxt.a libxtutil.a noinst_LIBRARIES = libpbxt.a
libpbxt_a_SOURCES = $(libpbxt_la_SOURCES) libpbxt_a_SOURCES = $(libpbxt_la_SOURCES)
libpbxt_a_CXXFLAGS = $(AM_CXXFLAGS) $(DRIZZLE_WARNINGS) libpbxt_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-long-long
libpbxt_a_CFLAGS = $(AM_CFLAGS) -std=c99 $(DRIZZLE_WARNINGS) libpbxt_a_CFLAGS = $(AM_CFLAGS) -std=c99
libxtutil_a_SOURCES = strutil_xt.cc \
trace_xt.cc
libxtutil_a_CXXFLAGS = $(AM_CXXFLAGS)
libxtutil_a_CFLAGS = $(AM_CFLAGS)
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt
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