mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
several ndb make changes, see respective file
This commit is contained in:
tomas@poseidon.bredbandsbolaget.se
16
acinclude.m4
16
acinclude.m4
@@ -1348,6 +1348,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
|
||||
--with-ndb-sci Include the NDB Cluster sci transporter],
|
||||
[ndb_sci="$withval"],
|
||||
[ndb_sci=no])
|
||||
AC_ARG_WITH([ndb-test],
|
||||
[
|
||||
--with-ndb-test Include the NDB Cluster ndbapi test programs],
|
||||
[ndb_test="$withval"],
|
||||
[ndb_test=no])
|
||||
|
||||
AC_MSG_CHECKING([for NDB Cluster options])
|
||||
AC_MSG_RESULT([])
|
||||
@@ -1376,6 +1381,17 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
|
||||
;;
|
||||
esac
|
||||
|
||||
have_ndb_test=no
|
||||
case "$ndb_test" in
|
||||
yes )
|
||||
AC_MSG_RESULT([-- including ndbapi test programs])
|
||||
have_ndb_test="yes"
|
||||
;;
|
||||
* )
|
||||
AC_MSG_RESULT([-- not including ndbapi test programs])
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_MSG_RESULT([done.])
|
||||
])
|
||||
|
||||
|
||||
102
configure.in
102
configure.in
@@ -2841,83 +2841,7 @@ then
|
||||
CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
|
||||
fi
|
||||
|
||||
ndbbindir_root="\$(prefix)"
|
||||
ndbbindir="\$(ndbbindir_root)/ndb/bin"
|
||||
AC_SUBST(ndbbindir_root)
|
||||
AC_SUBST(ndbbindir)
|
||||
ndbtoolsdir_root="\$(prefix)"
|
||||
ndbtoolsdir="\$(ndbtoolsdir_root)/ndb/tools"
|
||||
AC_SUBST(ndbtoolsdir_root)
|
||||
AC_SUBST(ndbtoolsdir)
|
||||
ndblibdir_root="\$(prefix)"
|
||||
ndblibdir="\$(ndblibdir_root)/ndb/lib"
|
||||
AC_SUBST(ndblibdir_root)
|
||||
AC_SUBST(ndblibdir)
|
||||
ndbtestdir_root="\$(prefix)"
|
||||
ndbtestdir="\$(ndbtestdir_root)/ndb/test"
|
||||
AC_SUBST(ndbtestdir_root)
|
||||
AC_SUBST(ndbtestdir)
|
||||
ndbincludedir_root="\$(prefix)"
|
||||
ndbincludedir="\$(ndbincludedir_root)/ndb/include"
|
||||
AC_SUBST(ndbincludedir_root)
|
||||
AC_SUBST(ndbincludedir)
|
||||
ndbapiincludedir_root="\$(prefix)"
|
||||
ndbapiincludedir="\$(ndbapiincludedir_root)/ndb/include/ndbapi"
|
||||
AC_SUBST(ndbapiincludedir_root)
|
||||
AC_SUBST(ndbapiincludedir)
|
||||
mgmapiincludedir_root="\$(prefix)"
|
||||
mgmapiincludedir="\$(mgmapiincludedir_root)/ndb/include/mgmapi"
|
||||
AC_SUBST(mgmapiincludedir_root)
|
||||
AC_SUBST(mgmapiincludedir)
|
||||
|
||||
NDB_UTIL_INCLUDES="-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
|
||||
-I\$(top_srcdir)/ndb/include/util \
|
||||
-I\$(top_srcdir)/ndb/include/portlib \
|
||||
-I\$(top_srcdir)/ndb/include/logger"
|
||||
NDB_KERNEL_INCLUDES="\
|
||||
-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
|
||||
-I\$(top_srcdir)/ndb/src/kernel/vm \
|
||||
-I\$(top_srcdir)/ndb/src/kernel/error \
|
||||
-I\$(top_srcdir)/ndb/src/kernel \
|
||||
-I\$(top_srcdir)/ndb/include/kernel \
|
||||
-I\$(top_srcdir)/ndb/include/transporter \
|
||||
-I\$(top_srcdir)/ndb/include/debugger \
|
||||
-I\$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I\$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I\$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I\$(top_srcdir)/ndb/include/util \
|
||||
-I\$(top_srcdir)/ndb/include/portlib \
|
||||
-I\$(top_srcdir)/ndb/include/logger"
|
||||
NDB_NDBAPI_INCLUDES="\
|
||||
-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
|
||||
-I\$(top_srcdir)/ndb/include/kernel \
|
||||
-I\$(top_srcdir)/ndb/include/transporter \
|
||||
-I\$(top_srcdir)/ndb/include/debugger \
|
||||
-I\$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I\$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I\$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I\$(top_srcdir)/ndb/include/util \
|
||||
-I\$(top_srcdir)/ndb/include/portlib \
|
||||
-I\$(top_srcdir)/ndb/include/logger"
|
||||
NDB_NDBAPITEST_INCLUDES="\
|
||||
-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
|
||||
-I\$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I\$(top_srcdir)/ndb/include/util \
|
||||
-I\$(top_srcdir)/ndb/include/portlib \
|
||||
-I\$(top_srcdir)/ndb/test/include \
|
||||
-I\$(top_srcdir)/ndb/include/mgmapi"
|
||||
NDB_NDBAPICLIENT_INCLUDES="-I\$(top_srcdir)/ndb/include/ndbapi"
|
||||
NDB_MGMAPICLIENT_INCLUDES="-I\$(top_srcdir)/ndb/include/mgmapi"
|
||||
|
||||
AC_SUBST(NDB_DEFS)
|
||||
AC_SUBST(NDB_UTIL_INCLUDES)
|
||||
|
||||
AC_SUBST(NDB_UTIL_INCLUDES)
|
||||
AC_SUBST(NDB_KERNEL_INCLUDES)
|
||||
AC_SUBST(NDB_NDBAPI_INCLUDES)
|
||||
AC_SUBST(NDB_NDBAPITEST_INCLUDES)
|
||||
AC_SUBST(NDB_NDBAPICLIENT_INCLUDES)
|
||||
AC_SUBST(NDB_MGMAPICLIENT_INCLUDES)
|
||||
AC_SUBST([NDB_DEFS])
|
||||
|
||||
ndb_transporter_opt_objs=""
|
||||
if test X"$have_ndb_shm" = Xyes
|
||||
@@ -2928,24 +2852,23 @@ if test X"$have_ndb_sci" = Xyes
|
||||
then
|
||||
ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SCI_Transporter.lo"
|
||||
fi
|
||||
AC_SUBST(ndb_transporter_opt_objs)
|
||||
AC_SUBST([ndb_transporter_opt_objs])
|
||||
|
||||
#NDB_TYPE_COMMON="include \$(top_srcdir)/ndb/config/common.mk.am"
|
||||
#NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapi.mk.am"
|
||||
#NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapitest.mk.am"
|
||||
#NDB_TYPE_KERNEL="include \$(top_srcdir)/ndb/config/type_kernel.mk.am"
|
||||
#NDB_TYPE_UTIL="include \$(top_srcdir)/ndb/config/type_util.mk.am"
|
||||
#AC_SUBST(NDB_TYPE_COMMON)
|
||||
#AC_SUBST(NDB_TYPE_NDBAPI)
|
||||
#AC_SUBST(NDB_TYPE_NDBAPITEST)
|
||||
#AC_SUBST(NDB_TYPE_KERNEL)
|
||||
#AC_SUBST(NDB_TYPE_UTIL)
|
||||
ndb_bin_am_ldflags="-static"
|
||||
if test X"$have_ndb_test" = Xyes
|
||||
then
|
||||
ndb_opt_test_subdirs="tools ndbapi run-test"
|
||||
ndb_bin_am_ldflags=""
|
||||
fi
|
||||
AC_SUBST([ndb_bin_am_ldflags])
|
||||
AC_SUBST([ndb_opt_test_subdirs])
|
||||
|
||||
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
|
||||
|
||||
# Output results
|
||||
AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
|
||||
ndb/Makefile ndb/src/Makefile ndb/src/common/Makefile dnl
|
||||
ndb/Makefile ndb/include/Makefile dnl
|
||||
ndb/src/Makefile ndb/src/common/Makefile dnl
|
||||
ndb/tools/Makefile dnl
|
||||
ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl
|
||||
ndb/src/common/portlib/Makefile ndb/src/common/portlib/unix/Makefile dnl
|
||||
@@ -2975,7 +2898,6 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
|
||||
ndb/src/kernel/blocks/grep/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtux/Makefile dnl
|
||||
ndb/src/kernel/vm/Makefile dnl
|
||||
ndb/src/kernel/ndb-main/Makefile dnl
|
||||
ndb/src/mgmapi/Makefile dnl
|
||||
ndb/src/ndbapi/Makefile dnl
|
||||
ndb/src/mgmsrv/Makefile dnl
|
||||
|
||||
@@ -9,21 +9,32 @@ port_base="22" # using ports port_base{"00","01", etc}
|
||||
fsdir=`pwd`
|
||||
# end configurable parameters
|
||||
|
||||
# Are we using a source or a binary distribution?
|
||||
#BASEDIR is always one above mysql-test directory
|
||||
CWD=`pwd`
|
||||
cd ..
|
||||
BASEDIR=`pwd`
|
||||
cd $CWD
|
||||
|
||||
# Are we using a source or a binary distribution?
|
||||
if [ -d ../sql ] ; then
|
||||
SOURCE_DIST=1
|
||||
ndbtop=`pwd`/../ndb
|
||||
ndbtop=$BASEDIR/ndb
|
||||
exec_ndb=$ndbtop/src/kernel/ndb-main/ndb
|
||||
exec_mgmtsrvr=$ndbtop/src/mgmsrv/mgmtsrvr
|
||||
exec_waiter=$ndbtop/tools/ndb_waiter
|
||||
exec_mgmtclient=$ndbtop/src/mgmclient/mgmtclient
|
||||
else
|
||||
BINARY_DIST=1
|
||||
exec_ndb=@ndbbindir@/ndb
|
||||
exec_mgmtsrvr=@ndbbindir@/mgmtsrvr
|
||||
exec_waiter=@ndbtoolsdir@/ndb_waiter
|
||||
exec_mgmtclient=@ndbbindir@/mgmtclient
|
||||
if test -x "$BASEDIR/libexec/ndb"
|
||||
then
|
||||
exec_ndb=$BASEDIR/libexec/ndb
|
||||
exec_mgmtsrvr=$BASEDIR/libexec/mgmtsrvr
|
||||
else
|
||||
exec_ndb=$BASEDIR/bin/ndb
|
||||
exec_mgmtsrvr=$BASEDIR/bin/mgmtsrvr
|
||||
fi
|
||||
exec_waiter=$BASEDIR/bin/ndb_waiter
|
||||
exec_mgmtclient=$BASEDIR/bin/mgmtclient
|
||||
fi
|
||||
|
||||
pidfile=ndbcluster.pid
|
||||
|
||||
@@ -4,13 +4,32 @@
|
||||
|
||||
# This scripts stops the table handler ndbcluster
|
||||
|
||||
#BASEDIR is always one above mysql-test directory
|
||||
CWD=`pwd`
|
||||
cd ..
|
||||
BASEDIR=`pwd`
|
||||
cd $CWD
|
||||
|
||||
# Are we using a source or a binary distribution?
|
||||
if [ -d ../sql ] ; then
|
||||
SOURCE_DIST=1
|
||||
ndbtop=`pwd`/../ndb
|
||||
ndbtop=$BASEDIR/ndb
|
||||
exec_ndb=$ndbtop/src/kernel/ndb-main/ndb
|
||||
exec_mgmtsrvr=$ndbtop/src/mgmsrv/mgmtsrvr
|
||||
exec_waiter=$ndbtop/tools/ndb_waiter
|
||||
exec_mgmtclient=$ndbtop/src/mgmclient/mgmtclient
|
||||
else
|
||||
BINARY_DIST=1
|
||||
exec_mgmtclient=@ndbbindir@/mgmtclient
|
||||
if test -x "$BASEDIR/libexec/ndb"
|
||||
then
|
||||
exec_ndb=$BASEDIR/libexec/ndb
|
||||
exec_mgmtsrvr=$BASEDIR/libexec/mgmtsrvr
|
||||
else
|
||||
exec_ndb=$BASEDIR/bin/ndb
|
||||
exec_mgmtsrvr=$BASEDIR/bin/mgmtsrvr
|
||||
fi
|
||||
exec_waiter=$BASEDIR/bin/ndb_waiter
|
||||
exec_mgmtclient=$BASEDIR/bin/mgmtclient
|
||||
fi
|
||||
|
||||
pidfile=ndbcluster.pid
|
||||
|
||||
@@ -1,39 +1,10 @@
|
||||
SUBDIRS = src test tools .
|
||||
SUBDIRS = src test tools . include
|
||||
|
||||
ndbinclude_HEADERS = \
|
||||
include/ndb_types.h \
|
||||
include/ndb_version.h
|
||||
|
||||
ndbapiinclude_HEADERS = \
|
||||
include/ndbapi/ndbapi_limits.h \
|
||||
include/ndbapi/Ndb.hpp \
|
||||
include/ndbapi/NdbApi.hpp \
|
||||
include/ndbapi/NdbConnection.hpp \
|
||||
include/ndbapi/NdbCursorOperation.hpp \
|
||||
include/ndbapi/NdbDictionary.hpp \
|
||||
include/ndbapi/NdbError.hpp \
|
||||
include/ndbapi/NdbEventOperation.hpp \
|
||||
include/ndbapi/NdbIndexOperation.hpp \
|
||||
include/ndbapi/NdbOperation.hpp \
|
||||
include/ndbapi/NdbPool.hpp \
|
||||
include/ndbapi/NdbRecAttr.hpp \
|
||||
include/ndbapi/NdbReceiver.hpp \
|
||||
include/ndbapi/NdbResultSet.hpp \
|
||||
include/ndbapi/NdbScanFilter.hpp \
|
||||
include/ndbapi/NdbScanOperation.hpp \
|
||||
include/ndbapi/NdbSchemaCon.hpp \
|
||||
include/ndbapi/NdbSchemaOp.hpp
|
||||
|
||||
mgmapiinclude_HEADERS = \
|
||||
include/mgmapi/mgmapi.h \
|
||||
include/mgmapi/mgmapi_debug.h
|
||||
|
||||
EXTRA_DIST = include
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
dist-hook:
|
||||
-rm -rf `find $(distdir) -type d -name SCCS`
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" != "."; then \
|
||||
if test "$$subdir" != "." -a "$$subdir" != "include"; then \
|
||||
files="`find $$subdir -name '*\.h'` `find $$subdir -name '*\.hpp'`"; \
|
||||
for f in $$files; do \
|
||||
if test -d "$(distdir)/`dirname $$f`" -a ! -e "$(distdir)/$$f"; then \
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
ndbbindir = "$(libexecdir)"
|
||||
ndbtoolsdir = "$(bindir)"
|
||||
ndbtestdir = "$(bindir)"
|
||||
ndblibdir = "$(pkglibdir)"
|
||||
ndbincludedir = "$(pkgincludedir)/ndb"
|
||||
ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
|
||||
mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
|
||||
|
||||
INCLUDES = $(INCLUDES_LOC)
|
||||
LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
|
||||
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
|
||||
# ndb cannot be compiled with -fno-implicit-templaces
|
||||
NDB_CXXFLAGS=-fimplicit-templates
|
||||
##use AM_CXXFLAGS for other flags
|
||||
|
||||
#noinst_SCRIPTS = ndb_local_bin
|
||||
ndb_local_bin: $(PROGRAMS)
|
||||
set -x; \
|
||||
for f in $(PROGRAMS); do \
|
||||
g=lib/`basename $$f`; \
|
||||
rm -f $$g; \
|
||||
@LN_CP_F@ $$f; \
|
||||
done; \
|
||||
touch $@;
|
||||
|
||||
@@ -1,2 +1,18 @@
|
||||
|
||||
INCLUDES += @NDB_KERNEL_INCLUDES@
|
||||
INCLUDES += \
|
||||
-I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/src/kernel/vm \
|
||||
-I$(top_srcdir)/ndb/src/kernel/error \
|
||||
-I$(top_srcdir)/ndb/src/kernel \
|
||||
-I$(top_srcdir)/ndb/include/kernel \
|
||||
-I$(top_srcdir)/ndb/include/transporter \
|
||||
-I$(top_srcdir)/ndb/include/debugger \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
|
||||
#AM_LDFLAGS = @ndb_ldflags@
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
|
||||
INCLUDES += @NDB_MGMAPICLIENT_INCLUDES@
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi
|
||||
|
||||
@@ -1,2 +1,12 @@
|
||||
|
||||
INCLUDES += @NDB_NDBAPI_INCLUDES@
|
||||
INCLUDES += \
|
||||
-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/kernel \
|
||||
-I$(top_srcdir)/ndb/include/transporter \
|
||||
-I$(top_srcdir)/ndb/include/debugger \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
|
||||
INCLUDES += @NDB_NDBAPICLIENT_INCLUDES@
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
|
||||
AM_LDFLAGS = -rpath @ndblibdir@
|
||||
LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
|
||||
$(top_srcdir)/ndb/src/libndbclient.la
|
||||
|
||||
INCLUDES += @NDB_NDBAPITEST_INCLUDES@
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/test/include \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
|
||||
LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
|
||||
$(top_srcdir)/ndb/src/.libs/libndbclient.a
|
||||
$(top_srcdir)/ndb/src/libndbclient.la
|
||||
|
||||
INCLUDES += @NDB_NDBAPITEST_INCLUDES@
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/test/include \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi
|
||||
|
||||
@@ -1,2 +1,6 @@
|
||||
|
||||
INCLUDES += @NDB_UTIL_INCLUDES@
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
|
||||
43
ndb/include/Makefile.am
Normal file
43
ndb/include/Makefile.am
Normal file
@@ -0,0 +1,43 @@
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
ndbinclude_HEADERS = \
|
||||
ndb_types.h \
|
||||
ndb_version.h
|
||||
|
||||
ndbapiinclude_HEADERS = \
|
||||
ndbapi/ndbapi_limits.h \
|
||||
ndbapi/Ndb.hpp \
|
||||
ndbapi/NdbApi.hpp \
|
||||
ndbapi/NdbConnection.hpp \
|
||||
ndbapi/NdbCursorOperation.hpp \
|
||||
ndbapi/NdbDictionary.hpp \
|
||||
ndbapi/NdbError.hpp \
|
||||
ndbapi/NdbEventOperation.hpp \
|
||||
ndbapi/NdbIndexOperation.hpp \
|
||||
ndbapi/NdbOperation.hpp \
|
||||
ndbapi/NdbPool.hpp \
|
||||
ndbapi/NdbRecAttr.hpp \
|
||||
ndbapi/NdbReceiver.hpp \
|
||||
ndbapi/NdbResultSet.hpp \
|
||||
ndbapi/NdbScanFilter.hpp \
|
||||
ndbapi/NdbScanOperation.hpp \
|
||||
ndbapi/NdbSchemaCon.hpp \
|
||||
ndbapi/NdbSchemaOp.hpp \
|
||||
ndbapi/ndberror.h
|
||||
|
||||
mgmapiinclude_HEADERS = \
|
||||
mgmapi/mgmapi.h \
|
||||
mgmapi/mgmapi_debug.h
|
||||
|
||||
noinst_HEADERS = \
|
||||
ndb_global.h \
|
||||
ndb_net.h \
|
||||
mgmapi/mgmapi_config_parameters.h \
|
||||
mgmapi/mgmapi_config_parameters_debug.h
|
||||
|
||||
EXTRA_DIST = debugger editline kernel logger mgmcommon \
|
||||
portlib transporter util
|
||||
|
||||
dist-hook:
|
||||
-rm -rf `find $(distdir) -type d -name SCCS`
|
||||
@@ -1,5 +1,7 @@
|
||||
SUBDIRS = common mgmapi ndbapi . kernel mgmsrv mgmclient cw
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
ndblib_LTLIBRARIES = libndbclient.la
|
||||
|
||||
libndbclient_la_SOURCES =
|
||||
@@ -14,5 +16,3 @@ libndbclient_la_LIBADD = \
|
||||
$(top_srcdir)/ndb/src/common/logger/liblogger.la \
|
||||
$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
|
||||
$(top_srcdir)/ndb/src/common/util/libgeneral.la
|
||||
|
||||
AM_LDFLAGS = -rpath @ndblibdir@
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
SUBDIRS = unix
|
||||
SUBDIRS = unix
|
||||
|
||||
noinst_DATA = gcc.cpp
|
||||
|
||||
@@ -3,10 +3,12 @@ ndbtools_PROGRAMS = ndb_cpcd
|
||||
|
||||
ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
|
||||
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_util.mk.am
|
||||
|
||||
AM_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -1 +1,58 @@
|
||||
SUBDIRS = error blocks vm ndb-main
|
||||
SUBDIRS = error blocks vm
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
ndbbin_PROGRAMS = ndb
|
||||
|
||||
ndb_SOURCES = Main.cpp SimBlockList.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
INCLUDES += \
|
||||
-Iblocks/cmvmi \
|
||||
-Iblocks/dbacc \
|
||||
-Iblocks/dbdict \
|
||||
-Iblocks/dbdih \
|
||||
-Iblocks/dblqh \
|
||||
-Iblocks/dbtc \
|
||||
-Iblocks/dbtup \
|
||||
-Iblocks/ndbfs \
|
||||
-Iblocks/ndbcntr \
|
||||
-Iblocks/qmgr \
|
||||
-Iblocks/trix \
|
||||
-Iblocks/backup \
|
||||
-Iblocks/dbutil \
|
||||
-Iblocks/suma \
|
||||
-Iblocks/grep \
|
||||
-Iblocks/dbtux
|
||||
|
||||
LDADD += \
|
||||
blocks/cmvmi/libcmvmi.a \
|
||||
blocks/dbacc/libdbacc.a \
|
||||
blocks/dbdict/libdbdict.a \
|
||||
blocks/dbdih/libdbdih.a \
|
||||
blocks/dblqh/libdblqh.a \
|
||||
blocks/dbtc/libdbtc.a \
|
||||
blocks/dbtup/libdbtup.a \
|
||||
blocks/ndbfs/libndbfs.a \
|
||||
blocks/ndbcntr/libndbcntr.a \
|
||||
blocks/qmgr/libqmgr.a \
|
||||
blocks/trix/libtrix.a \
|
||||
blocks/backup/libbackup.a \
|
||||
blocks/dbutil/libdbutil.a \
|
||||
blocks/suma/libsuma.a \
|
||||
blocks/grep/libgrep.a \
|
||||
blocks/dbtux/libdbtux.a \
|
||||
vm/libkernel.a \
|
||||
error/liberror.a \
|
||||
$(top_srcdir)/ndb/src/common/transporter/libtransporter.la \
|
||||
$(top_srcdir)/ndb/src/common/debugger/libtrace.la \
|
||||
$(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
|
||||
$(top_srcdir)/ndb/src/common/logger/liblogger.la \
|
||||
$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
|
||||
$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
|
||||
$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
|
||||
$(top_srcdir)/ndb/src/common/util/libgeneral.la
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -8,3 +8,5 @@ LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
INCLUDES += -I.. -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/ndbapi -I$(top_srcdir)/ndb/include/util -I$(top_srcdir)/ndb/include/portlib -I$(top_srcdir)/ndb/include/kernel
|
||||
|
||||
AM_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
pkglib_LIBRARIES = libsuma.a
|
||||
noinst_LIBRARIES = libsuma.a
|
||||
|
||||
libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
pkglib_LIBRARIES = liberror.a
|
||||
noinst_LIBRARIES = liberror.a
|
||||
|
||||
liberror_a_SOURCES = TimeModule.cpp \
|
||||
ErrorReporter.cpp \
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
|
||||
ndbbindir_root = $(prefix)
|
||||
ndbbindir = $(ndbbindir_root)/ndb/bin
|
||||
ndbbin_PROGRAMS = ndb
|
||||
|
||||
ndb_SOURCES = Main.cpp SimBlockList.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
INCLUDES += \
|
||||
-I../blocks/cmvmi \
|
||||
-I../blocks/dbacc \
|
||||
-I../blocks/dbdict \
|
||||
-I../blocks/dbdih \
|
||||
-I../blocks/dblqh \
|
||||
-I../blocks/dbtc \
|
||||
-I../blocks/dbtup \
|
||||
-I../blocks/ndbfs \
|
||||
-I../blocks/ndbcntr \
|
||||
-I../blocks/qmgr \
|
||||
-I../blocks/trix \
|
||||
-I../blocks/backup \
|
||||
-I../blocks/dbutil \
|
||||
-I../blocks/suma \
|
||||
-I../blocks/grep \
|
||||
-I../blocks/dbtux
|
||||
|
||||
LDADD += \
|
||||
../blocks/cmvmi/libcmvmi.a \
|
||||
../blocks/dbacc/libdbacc.a \
|
||||
../blocks/dbdict/libdbdict.a \
|
||||
../blocks/dbdih/libdbdih.a \
|
||||
../blocks/dblqh/libdblqh.a \
|
||||
../blocks/dbtc/libdbtc.a \
|
||||
../blocks/dbtup/libdbtup.a \
|
||||
../blocks/ndbfs/libndbfs.a \
|
||||
../blocks/ndbcntr/libndbcntr.a \
|
||||
../blocks/qmgr/libqmgr.a \
|
||||
../blocks/trix/libtrix.a \
|
||||
../blocks/backup/libbackup.a \
|
||||
../blocks/dbutil/libdbutil.a \
|
||||
../blocks/suma/libsuma.a \
|
||||
../blocks/grep/libgrep.a \
|
||||
../blocks/dbtux/libdbtux.a \
|
||||
../vm/libkernel.a \
|
||||
../error/liberror.a \
|
||||
$(top_srcdir)/ndb/src/common/transporter/.libs/libtransporter.a \
|
||||
$(top_srcdir)/ndb/src/common/debugger/.libs/libtrace.a \
|
||||
$(top_srcdir)/ndb/src/common/debugger/signaldata/.libs/libsignaldataprint.a \
|
||||
$(top_srcdir)/ndb/src/common/logger/.libs/liblogger.a \
|
||||
$(top_srcdir)/ndb/src/common/mgmcommon/.libs/libmgmsrvcommon.a \
|
||||
$(top_srcdir)/ndb/src/mgmapi/.libs/libmgmapi.a \
|
||||
$(top_srcdir)/ndb/src/common/portlib/unix/.libs/libportlib.a \
|
||||
$(top_srcdir)/ndb/src/common/util/.libs/libgeneral.a
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
@@ -1,42 +0,0 @@
|
||||
include .defs.mk
|
||||
|
||||
TYPE := kernel
|
||||
|
||||
BIN_TARGET := ndb
|
||||
BIN_TARGET_ARCHIVES := mgmapi \
|
||||
cmvmi dbacc dbdict dbdih dblqh dbtc \
|
||||
dbtup ndbfs ndbcntr qmgr trix backup dbutil suma grep dbtux \
|
||||
transporter \
|
||||
kernel \
|
||||
error \
|
||||
trace \
|
||||
signaldataprint \
|
||||
mgmsrvcommon mgmapi \
|
||||
portlib \
|
||||
logger \
|
||||
general
|
||||
|
||||
# Source files of non-templated classes (.cpp files)
|
||||
SOURCES = \
|
||||
Main.cpp \
|
||||
SimBlockList.cpp
|
||||
|
||||
CCFLAGS_LOC = -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/cmvmi) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbacc) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbdict) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbdih) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dblqh) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbtc) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbtup) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/ndbfs) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/missra) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/ndbcntr) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/qmgr) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/trix) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/backup) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbutil) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/suma) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/grep) \
|
||||
-I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbtux)
|
||||
|
||||
include $(NDB_TOP)/Epilogue.mk
|
||||
@@ -3,7 +3,7 @@
|
||||
#DIRS += testLongSig
|
||||
#endif
|
||||
|
||||
pkglib_LIBRARIES = libkernel.a
|
||||
noinst_LIBRARIES = libkernel.a
|
||||
|
||||
libkernel_a_SOURCES = \
|
||||
SimulatedBlock.cpp \
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
|
||||
noinst_LTLIBRARIES = libmgmapi.la libMGM_API.la
|
||||
noinst_LTLIBRARIES = libmgmapi.la
|
||||
|
||||
libmgmapi_la_SOURCES_loc = mgmapi.cpp mgmapi_configuration.cpp
|
||||
|
||||
libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
|
||||
libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
|
||||
libmgmapi_la_SOURCES = mgmapi.cpp mgmapi_configuration.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
|
||||
DEFS_LOC = -DNO_DEBUG_MESSAGES
|
||||
@@ -12,9 +9,5 @@ DEFS_LOC = -DNO_DEBUG_MESSAGES
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_util.mk.am
|
||||
|
||||
libMGM_API_la_LIBADD = \
|
||||
$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
|
||||
$(top_srcdir)/ndb/src/common/util/libgeneral.la
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
ndbbin_PROGRAMS = mgmtclient
|
||||
ndbtools_PROGRAMS = mgmtclient
|
||||
|
||||
mgmtclient_SOURCES = \
|
||||
main.cpp \
|
||||
@@ -11,9 +11,11 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
|
||||
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a \
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
|
||||
$(top_srcdir)/ndb/src/common/editline/libeditline.a \
|
||||
@TERMCAP_LIB@
|
||||
|
||||
AM_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -17,12 +17,14 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
|
||||
-I$(top_srcdir)/ndb/src/mgmapi \
|
||||
-I$(top_srcdir)/ndb/src/common/mgmcommon
|
||||
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a \
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
|
||||
$(top_srcdir)/ndb/src/common/editline/libeditline.a \
|
||||
@TERMCAP_LIB@
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
AM_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
#SUBDIRS = signal-sender
|
||||
|
||||
noinst_LTLIBRARIES = libndbapi.la libNDB_API.la
|
||||
noinst_LTLIBRARIES = libndbapi.la
|
||||
|
||||
libndbapi_la_SOURCES_loc = \
|
||||
libndbapi_la_SOURCES = \
|
||||
TransporterFacade.cpp \
|
||||
ClusterMgr.cpp \
|
||||
Ndb.cpp \
|
||||
NdbPoolImpl.cpp NdbPool.cpp \
|
||||
NdbPoolImpl.cpp \
|
||||
NdbPool.cpp \
|
||||
Ndblist.cpp \
|
||||
Ndbif.cpp \
|
||||
Ndbinit.cpp \
|
||||
@@ -23,7 +24,8 @@ libndbapi_la_SOURCES_loc = \
|
||||
NdbOperationExec.cpp \
|
||||
NdbResultSet.cpp \
|
||||
NdbCursorOperation.cpp \
|
||||
NdbScanReceiver.cpp NdbScanOperation.cpp NdbScanFilter.cpp \
|
||||
NdbScanReceiver.cpp NdbScanOperation.cpp \
|
||||
NdbScanFilter.cpp \
|
||||
NdbIndexOperation.cpp \
|
||||
NdbEventOperation.cpp \
|
||||
NdbEventOperationImpl.cpp \
|
||||
@@ -33,25 +35,14 @@ libndbapi_la_SOURCES_loc = \
|
||||
NdbSchemaOp.cpp \
|
||||
NdbUtil.cpp \
|
||||
NdbReceiver.cpp \
|
||||
NdbDictionary.cpp NdbDictionaryImpl.cpp DictCache.cpp
|
||||
|
||||
libndbapi_la_SOURCES = $(libndbapi_la_SOURCES_loc)
|
||||
libNDB_API_la_SOURCES = $(libndbapi_la_SOURCES_loc)
|
||||
NdbDictionary.cpp \
|
||||
NdbDictionaryImpl.cpp \
|
||||
DictCache.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
libNDB_API_la_LIBADD = \
|
||||
$(top_srcdir)/ndb/src/common/transporter/libtransporter.la \
|
||||
$(top_srcdir)/ndb/src/common/debugger/libtrace.la \
|
||||
$(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
|
||||
$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
|
||||
$(top_srcdir)/ndb/src/mgmapi/libMGM_API.la \
|
||||
$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
|
||||
$(top_srcdir)/ndb/src/common/logger/liblogger.la \
|
||||
$(top_srcdir)/ndb/src/common/util/libgeneral.la
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
include .defs.mk
|
||||
|
||||
DIRS :=
|
||||
|
||||
include $(NDB_TOP)/Epilogue.mk
|
||||
@@ -1 +1,7 @@
|
||||
SUBDIRS = src tools ndbapi run-test
|
||||
SUBDIRS = src $(ndb_opt_test_subdirs)
|
||||
DIST_SUBDIRS = src tools ndbapi run-test
|
||||
|
||||
EXTRA_DIST = include
|
||||
|
||||
dist-hook:
|
||||
-rm -rf `find $(distdir) -type d -name SCCS`
|
||||
|
||||
@@ -13,5 +13,7 @@ select_count_SOURCES = select_count.cpp
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
|
||||
|
||||
AM_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
@@ -267,14 +267,14 @@ fi
|
||||
|
||||
# NDB Cluster
|
||||
if [ x$NDBCLUSTER = x1 ]; then
|
||||
if [ ! -f ndb/BinDist.sh ]; then
|
||||
echo "Missing ndb/BinDist.sh"; exit 1
|
||||
fi
|
||||
mkdir $BASE/ndb || exit 1
|
||||
# assume we have cpio..
|
||||
if (cd ndb && sh BinDist.sh | cpio -pdm $BASE/ndb); then :; else
|
||||
echo "Copy failed - missing files in ndb/BinDist.sh ?"; exit 1
|
||||
fi
|
||||
( cd ndb ; make DESTDIR=$BASE/ndb-stage install )
|
||||
( cd mysql-test/ndb ; make DESTDIR=$BASE/ndb-stage install )
|
||||
$CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
|
||||
$CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
|
||||
$CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
|
||||
$CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/lib/.
|
||||
$CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
|
||||
rm -rf $BASE/ndb-stage
|
||||
fi
|
||||
|
||||
# Change the distribution to a long descriptive name
|
||||
|
||||
Reference in New Issue
Block a user