Skip to content

M
MariaDB
Commit 14076ac4 authored by unknown's avatar unknown
Browse files
Options

All changes for change to all storage engines being under storage directory. 


config/ac-macros/ha_berkeley.m4:
  change for stroage
config/ac-macros/ha_innodb.m4:
  change for storage
config/ac-macros/ha_ndbcluster.m4:
  change for storage
configure.in:
  change for storage
extra/perror.c:
  change for storage
libmysqld/Makefile.am:
  change for storage
mysql-test/mysql-test-run.sh:
  change for storage
sql/Makefile.am:
  change for storage
sql/ha_innodb.cc:
  change storage
sql/ha_myisam.cc:
  change for storage
sql/ha_myisammrg.cc:
  change for storage
sql/lock.cc:
  change for storage
sql/sql_cache.cc:
  change for storage
storage/heap/Makefile.am:
  change for storage
storage/innobase/include/Makefile.i:
  change for storage
storage/myisammrg/myrg_def.h:
  change for storage
storage/ndb/Makefile.am:
  change for storage
storage/ndb/config/common.mk.am:
  change for storage
storage/ndb/config/type_kernel.mk.am:
  change for storage
storage/ndb/config/type_mgmapiclient.mk.am:
  change for storage
storage/ndb/config/type_ndbapi.mk.am:
  change for storage
storage/ndb/config/type_ndbapiclient.mk.am:
  change for storage
storage/ndb/config/type_ndbapitest.mk.am:
  change for storage
storage/ndb/config/type_ndbapitools.mk.am:
  change for storage
storage/ndb/config/type_util.mk.am:
  change for storage
storage/ndb/docs/Makefile.am:
  change for storage
storage/ndb/include/Makefile.am:
  change for storage
storage/ndb/src/Makefile.am:
  change for storage
storage/ndb/src/common/debugger/Makefile.am:
  change for storage
storage/ndb/src/common/debugger/signaldata/Makefile.am:
  change for storage
storage/ndb/src/common/logger/Makefile.am:
  change for storage
storage/ndb/src/common/mgmcommon/Makefile.am:
  change for storage
storage/ndb/src/common/portlib/Makefile.am:
  change for storage
storage/ndb/src/common/transporter/Makefile.am:
  change for storage
storage/ndb/src/common/util/Makefile.am:
  change for storage
storage/ndb/src/cw/cpcd/Makefile.am:
  change for storage
storage/ndb/src/kernel/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/backup/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/cmvmi/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbacc/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbtc/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/dbutil/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/grep/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/ndbfs/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/qmgr/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/suma/Makefile.am:
  change for storage
storage/ndb/src/kernel/blocks/trix/Makefile.am:
  change for storage
storage/ndb/src/kernel/error/Makefile.am:
  change for storage
storage/ndb/src/kernel/vm/Makefile.am:
  change for storage
storage/ndb/src/mgmapi/Makefile.am:
  change for storage
storage/ndb/src/mgmclient/Makefile.am:
  change for storage
storage/ndb/src/mgmsrv/Makefile.am:
  change for storage
storage/ndb/src/ndbapi/Makefile.am:
  change for storage
storage/ndb/test/ndbapi/Makefile.am:
  change for storage
storage/ndb/test/ndbapi/bank/Makefile.am:
  change for storage
storage/ndb/test/run-test/Makefile.am:
  change for storage
storage/ndb/test/src/Makefile.am:
  Change for storage
storage/ndb/test/tools/Makefile.am:
  Change for storage
storage/ndb/tools/Makefile.am:
  Change for storage
parent 0aa208ed
Hide whitespace changes
Inline Side-by-side
Showing with 765 additions and 760 deletions
config/ac-macros/ha_berkeley.m4
View file @ 14076ac4
......@@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SEARCH_FOR_BDB], [
dnl echo ["MYSQL_SEARCH_FOR_BDB"]
bdb_dir_ok="no BerkeleyDB found"
for test_dir in $srcdir/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
for test_dir in $srcdir/storage/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
dnl echo "-----------> Looking at ($test_dir; `cd $test_dir && pwd`)"
MYSQL_CHECK_BDB_DIR([$test_dir])
if test X"$bdb_dir_ok" = Xsource || test X"$bdb_dir_ok" = Xinstalled; then
......
config/ac-macros/ha_innodb.m4
View file @ 14076ac4
......@@ -20,45 +20,45 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
AC_MSG_RESULT([Using Innodb])
AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
have_innodb="yes"
innodb_includes="-I../innobase/include"
innodb_includes="-I\$(top_builddir)/innobase/include"
innodb_system_libs=""
dnl Some libs are listed several times, in order for gcc to sort out
dnl circular references.
innodb_libs="\
\$(top_builddir)/innobase/usr/libusr.a\
\$(top_builddir)/innobase/srv/libsrv.a\
\$(top_builddir)/innobase/dict/libdict.a\
\$(top_builddir)/innobase/que/libque.a\
\$(top_builddir)/innobase/srv/libsrv.a\
\$(top_builddir)/innobase/ibuf/libibuf.a\
\$(top_builddir)/innobase/row/librow.a\
\$(top_builddir)/innobase/pars/libpars.a\
\$(top_builddir)/innobase/btr/libbtr.a\
\$(top_builddir)/innobase/trx/libtrx.a\
\$(top_builddir)/innobase/read/libread.a\
\$(top_builddir)/innobase/usr/libusr.a\
\$(top_builddir)/innobase/buf/libbuf.a\
\$(top_builddir)/innobase/ibuf/libibuf.a\
\$(top_builddir)/innobase/eval/libeval.a\
\$(top_builddir)/innobase/log/liblog.a\
\$(top_builddir)/innobase/fsp/libfsp.a\
\$(top_builddir)/innobase/fut/libfut.a\
\$(top_builddir)/innobase/fil/libfil.a\
\$(top_builddir)/innobase/lock/liblock.a\
\$(top_builddir)/innobase/mtr/libmtr.a\
\$(top_builddir)/innobase/page/libpage.a\
\$(top_builddir)/innobase/rem/librem.a\
\$(top_builddir)/innobase/thr/libthr.a\
\$(top_builddir)/innobase/sync/libsync.a\
\$(top_builddir)/innobase/data/libdata.a\
\$(top_builddir)/innobase/mach/libmach.a\
\$(top_builddir)/innobase/ha/libha.a\
\$(top_builddir)/innobase/dyn/libdyn.a\
\$(top_builddir)/innobase/mem/libmem.a\
\$(top_builddir)/innobase/sync/libsync.a\
\$(top_builddir)/innobase/ut/libut.a\
\$(top_builddir)/innobase/os/libos.a\
\$(top_builddir)/innobase/ut/libut.a"
\$(top_builddir)/storage/innobase/usr/libusr.a\
\$(top_builddir)/storage/innobase/srv/libsrv.a\
\$(top_builddir)/storage/innobase/dict/libdict.a\
\$(top_builddir)/storage/innobase/que/libque.a\
\$(top_builddir)/storage/innobase/srv/libsrv.a\
\$(top_builddir)/storage/innobase/ibuf/libibuf.a\
\$(top_builddir)/storage/innobase/row/librow.a\
\$(top_builddir)/storage/innobase/pars/libpars.a\
\$(top_builddir)/storage/innobase/btr/libbtr.a\
\$(top_builddir)/storage/innobase/trx/libtrx.a\
\$(top_builddir)/storage/innobase/read/libread.a\
\$(top_builddir)/storage/innobase/usr/libusr.a\
\$(top_builddir)/storage/innobase/buf/libbuf.a\
\$(top_builddir)/storage/innobase/ibuf/libibuf.a\
\$(top_builddir)/storage/innobase/eval/libeval.a\
\$(top_builddir)/storage/innobase/log/liblog.a\
\$(top_builddir)/storage/innobase/fsp/libfsp.a\
\$(top_builddir)/storage/innobase/fut/libfut.a\
\$(top_builddir)/storage/innobase/fil/libfil.a\
\$(top_builddir)/storage/innobase/lock/liblock.a\
\$(top_builddir)/storage/innobase/mtr/libmtr.a\
\$(top_builddir)/storage/innobase/page/libpage.a\
\$(top_builddir)/storage/innobase/rem/librem.a\
\$(top_builddir)/storage/innobase/thr/libthr.a\
\$(top_builddir)/storage/innobase/sync/libsync.a\
\$(top_builddir)/storage/innobase/data/libdata.a\
\$(top_builddir)/storage/innobase/mach/libmach.a\
\$(top_builddir)/storage/innobase/ha/libha.a\
\$(top_builddir)/storage/innobase/dyn/libdyn.a\
\$(top_builddir)/storage/innobase/mem/libmem.a\
\$(top_builddir)/storage/innobase/sync/libsync.a\
\$(top_builddir)/storage/innobase/ut/libut.a\
\$(top_builddir)/storage/innobase/os/libos.a\
\$(top_builddir)/storage/innobase/ut/libut.a"
AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
;;
......
config/ac-macros/ha_ndbcluster.m4
View file @ 14076ac4
......@@ -131,10 +131,10 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
AC_MSG_RESULT([Using NDB Cluster])
AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
have_ndbcluster="yes"
ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi"
ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
ndbcluster_system_libs=""
ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
MYSQL_CHECK_NDB_OPTIONS
;;
* )
......
configure.in
View file @ 14076ac4
......@@ -2443,7 +2443,7 @@ then
if test X"$have_berkeley_db" != Xyes; then
# we must build berkeley db from source
sql_server_dirs="$sql_server_dirs $have_berkeley_db"
AC_CONFIG_FILES(bdb/Makefile)
AC_CONFIG_FILES(storage/bdb/Makefile)
echo "CONFIGURING FOR BERKELEY DB"
bdb_conf_flags="--disable-shared"
......@@ -2469,8 +2469,10 @@ then
rel_srcdir=
case "$srcdir" in
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../../$srcdir" ;;
* ) rel_srcdir="../../../$srcdir" ;;
esac
echo $bdb/build_unix
echo $rel_srcdir/$bdb/dist/configure
(cd $bdb/build_unix && \
sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
AC_MSG_ERROR([could not configure Berkeley DB])
......@@ -2483,12 +2485,12 @@ dnl echo "bdb = '$bdb'; inc = '$bdb_includes', lib = '$bdb_libs'"
else
if test -d bdb; then :
else
mkdir bdb && mkdir bdb/build_unix
mkdir storage/bdb && mkdir storage/bdb/build_unix
fi
if test -r bdb/build_unix/db.h; then :
if test -r storage/bdb/build_unix/db.h; then :
else
cat <<EOF > bdb/build_unix/db.h
cat <<EOF > storage/bdb/build_unix/db.h
This file is a placeholder to fool make. The way that automake
and GNU make work together causes some files to depend on this
......@@ -2511,8 +2513,8 @@ EOF
if test X"$have_innodb" = Xyes
then
innodb_conf_flags=""
sql_server_dirs="$sql_server_dirs innobase"
AC_CONFIG_SUBDIRS(innobase)
sql_server_dirs="$sql_server_dirs storage/innobase"
AC_CONFIG_SUBDIRS(storage/innobase)
fi
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
......@@ -2534,12 +2536,12 @@ esac
echo
exit 1
fi
sql_server_dirs="$sql_server_dirs ndb"
sql_server_dirs="$sql_server_dirs storage/ndb"
fi
#
# END of configuration for optional table handlers
#
sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
sql_server_dirs="$sql_server_dirs storage/myisam storage/myisammrg storage/heap vio sql"
fi
......@@ -2672,51 +2674,53 @@ AC_SUBST([NDB_SIZEOF_INT])
AC_SUBST([NDB_SIZEOF_LONG])
AC_SUBST([NDB_SIZEOF_LONG_LONG])
AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
ndb/src/Makefile ndb/src/common/Makefile dnl
ndb/docs/Makefile dnl
ndb/tools/Makefile dnl
ndb/src/common/debugger/Makefile dnl
ndb/src/common/debugger/signaldata/Makefile dnl
ndb/src/common/portlib/Makefile dnl
ndb/src/common/util/Makefile dnl
ndb/src/common/logger/Makefile dnl
ndb/src/common/transporter/Makefile dnl
ndb/src/common/mgmcommon/Makefile dnl
ndb/src/kernel/Makefile dnl
ndb/src/kernel/error/Makefile dnl
ndb/src/kernel/blocks/Makefile dnl
ndb/src/kernel/blocks/cmvmi/Makefile dnl
ndb/src/kernel/blocks/dbacc/Makefile dnl
ndb/src/kernel/blocks/dbdict/Makefile dnl
ndb/src/kernel/blocks/dbdih/Makefile dnl
ndb/src/kernel/blocks/dblqh/Makefile dnl
ndb/src/kernel/blocks/dbtc/Makefile dnl
ndb/src/kernel/blocks/dbtup/Makefile dnl
ndb/src/kernel/blocks/ndbfs/Makefile dnl
ndb/src/kernel/blocks/ndbcntr/Makefile dnl
ndb/src/kernel/blocks/qmgr/Makefile dnl
ndb/src/kernel/blocks/trix/Makefile dnl
ndb/src/kernel/blocks/backup/Makefile dnl
ndb/src/kernel/blocks/dbutil/Makefile dnl
ndb/src/kernel/blocks/suma/Makefile dnl
ndb/src/kernel/blocks/grep/Makefile dnl
ndb/src/kernel/blocks/dbtux/Makefile dnl
ndb/src/kernel/vm/Makefile dnl
ndb/src/mgmapi/Makefile dnl
ndb/src/ndbapi/Makefile dnl
ndb/src/mgmsrv/Makefile dnl
ndb/src/mgmclient/Makefile dnl
ndb/src/cw/Makefile dnl
ndb/src/cw/cpcd/Makefile dnl
ndb/test/Makefile dnl
ndb/test/src/Makefile dnl
ndb/test/ndbapi/Makefile dnl
ndb/test/ndbapi/bank/Makefile dnl
ndb/test/tools/Makefile dnl
ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
ndb/include/ndb_types.h dnl
AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
storage/ndb/docs/Makefile dnl
storage/ndb/tools/Makefile dnl
storage/ndb/src/common/debugger/Makefile dnl
storage/ndb/src/common/debugger/signaldata/Makefile dnl
storage/ndb/src/common/portlib/Makefile dnl
storage/ndb/src/common/util/Makefile dnl
storage/ndb/src/common/logger/Makefile dnl
storage/ndb/src/common/transporter/Makefile dnl
storage/ndb/src/common/mgmcommon/Makefile dnl
storage/ndb/src/kernel/Makefile dnl
storage/ndb/src/kernel/error/Makefile dnl
storage/ndb/src/kernel/blocks/Makefile dnl
storage/ndb/src/kernel/blocks/cmvmi/Makefile dnl
storage/ndb/src/kernel/blocks/dbacc/Makefile dnl
storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
storage/ndb/src/kernel/blocks/dbtc/Makefile dnl
storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
storage/ndb/src/kernel/blocks/ndbfs/Makefile dnl
storage/ndb/src/kernel/blocks/ndbcntr/Makefile dnl
storage/ndb/src/kernel/blocks/qmgr/Makefile dnl
storage/ndb/src/kernel/blocks/trix/Makefile dnl
storage/ndb/src/kernel/blocks/backup/Makefile dnl
storage/ndb/src/kernel/blocks/dbutil/Makefile dnl
storage/ndb/src/kernel/blocks/suma/Makefile dnl
storage/ndb/src/kernel/blocks/grep/Makefile dnl
storage/ndb/src/kernel/blocks/dbtux/Makefile dnl
storage/ndb/src/kernel/vm/Makefile dnl
storage/ndb/src/mgmapi/Makefile dnl
storage/ndb/src/ndbapi/Makefile dnl
storage/ndb/src/mgmsrv/Makefile dnl
storage/ndb/src/mgmclient/Makefile dnl
storage/ndb/src/cw/Makefile dnl
storage/ndb/src/cw/cpcd/Makefile dnl
storage/ndb/test/Makefile dnl
storage/ndb/test/src/Makefile dnl
storage/ndb/test/ndbapi/Makefile dnl
storage/ndb/test/ndbapi/bank/Makefile dnl
storage/ndb/test/tools/Makefile dnl
storage/ndb/test/run-test/Makefile dnl
storage/ndb/include/ndb_version.h dnl
storage/ndb/include/ndb_global.h dnl
storage/ndb/include/ndb_types.h dnl
mysql-test/ndb/Makefile dnl
)
fi
......@@ -2724,8 +2728,8 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
# Output results
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
strings/Makefile regex/Makefile heap/Makefile dnl
myisam/Makefile myisammrg/Makefile dnl
strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
storage/myisam/Makefile storage/myisammrg/Makefile dnl
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
......
extra/perror.c
View file @ 14076ac4
......@@ -24,7 +24,7 @@
#include <errno.h>
#include <my_getopt.h>
#ifdef HAVE_NDBCLUSTER_DB
#include "../ndb/src/ndbapi/ndberror.c"
#include "../storage/ndb/src/ndbapi/ndberror.c"
#endif
static my_bool verbose, print_all_codes;
......
libmysqld/Makefile.am
View file @ 14076ac4
......@@ -73,9 +73,9 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
# The following libraries should be included in libmysqld.a
INC_LIB= $(top_builddir)/regex/libregex.a \
$(top_builddir)/myisam/libmyisam.a \
$(top_builddir)/myisammrg/libmyisammrg.a \
$(top_builddir)/heap/libheap.a \
$(top_builddir)/storage/myisam/libmyisam.a \
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
$(top_builddir)/storage/heap/libheap.a \
@innodb_libs@ @bdb_libs_with_path@ \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
......
mysql-test/mysql-test-run.sh
View file @ 14076ac4
......@@ -584,8 +584,8 @@ if [ x$SOURCE_DIST = x1 ] ; then
CHARSETSDIR="$BASEDIR/sql/share/charsets"
INSTALL_DB="./install_test_db"
MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
NDB_TOOLS_DIR="$BASEDIR/storage/ndb/tools"
NDB_MGM="$BASEDIR/storage/ndb/src/mgmclient/ndb_mgm"
if [ -n "$USE_PURIFY" ] ; then
PSUP="$MYSQL_TEST_DIR/purify.suppress"
......
sql/Makefile.am
View file @ 14076ac4
......@@ -29,9 +29,9 @@ libexec_PROGRAMS = mysqld
noinst_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
LDADD = $(top_builddir)/myisam/libmyisam.a \
$(top_builddir)/myisammrg/libmyisammrg.a \
$(top_builddir)/heap/libheap.a \
LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
$(top_builddir)/storage/heap/libheap.a \
$(top_builddir)/vio/libvio.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \
......
sql/ha_innodb.cc
View file @ 14076ac4
......@@ -59,28 +59,28 @@ typedef byte mysql_byte;
/* Include necessary InnoDB headers */
extern "C" {
#include "../innobase/include/univ.i"
#include "../innobase/include/os0file.h"
#include "../innobase/include/os0thread.h"
#include "../innobase/include/srv0start.h"
#include "../innobase/include/srv0srv.h"
#include "../innobase/include/trx0roll.h"
#include "../innobase/include/trx0trx.h"
#include "../innobase/include/trx0sys.h"
#include "../innobase/include/mtr0mtr.h"
#include "../innobase/include/row0ins.h"
#include "../innobase/include/row0mysql.h"
#include "../innobase/include/row0sel.h"
#include "../innobase/include/row0upd.h"
#include "../innobase/include/log0log.h"
#include "../innobase/include/lock0lock.h"
#include "../innobase/include/dict0crea.h"
#include "../innobase/include/btr0cur.h"
#include "../innobase/include/btr0btr.h"
#include "../innobase/include/fsp0fsp.h"
#include "../innobase/include/sync0sync.h"
#include "../innobase/include/fil0fil.h"
#include "../innobase/include/trx0xa.h"
#include "../storage/innobase/include/univ.i"
#include "../storage/innobase/include/os0file.h"
#include "../storage/innobase/include/os0thread.h"
#include "../storage/innobase/include/srv0start.h"
#include "../storage/innobase/include/srv0srv.h"
#include "../storage/innobase/include/trx0roll.h"
#include "../storage/innobase/include/trx0trx.h"
#include "../storage/innobase/include/trx0sys.h"
#include "../storage/innobase/include/mtr0mtr.h"
#include "../storage/innobase/include/row0ins.h"
#include "../storage/innobase/include/row0mysql.h"
#include "../storage/innobase/include/row0sel.h"
#include "../storage/innobase/include/row0upd.h"
#include "../storage/innobase/include/log0log.h"
#include "../storage/innobase/include/lock0lock.h"
#include "../storage/innobase/include/dict0crea.h"
#include "../storage/innobase/include/btr0cur.h"
#include "../storage/innobase/include/btr0btr.h"
#include "../storage/innobase/include/fsp0fsp.h"
#include "../storage/innobase/include/sync0sync.h"
#include "../storage/innobase/include/fil0fil.h"
#include "../storage/innobase/include/trx0xa.h"
}
#define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
......
sql/ha_myisam.cc
View file @ 14076ac4
......@@ -27,8 +27,8 @@
#ifndef MASTER
#include "../srclib/myisam/myisamdef.h"
#else
#include "../myisam/myisamdef.h"
#include "../myisam/rt_index.h"
#include "../storage/myisam/myisamdef.h"
#include "../storage/myisam/rt_index.h"
#endif
ulong myisam_recover_options= HA_RECOVER_NONE;
......
sql/ha_myisammrg.cc
View file @ 14076ac4
......@@ -25,7 +25,7 @@
#ifndef MASTER
#include "../srclib/myisammrg/myrg_def.h"
#else
#include "../myisammrg/myrg_def.h"
#include "../storage/myisammrg/myrg_def.h"
#endif
/*****************************************************************************
......
sql/lock.cc
View file @ 14076ac4
......@@ -72,7 +72,7 @@
#ifndef MASTER
#include "../srclib/myisammrg/myrg_def.h"
#else
#include "../myisammrg/myrg_def.h"
#include "../storage/myisammrg/myrg_def.h"
#endif
static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table,uint count,
......
sql/sql_cache.cc
View file @ 14076ac4
......@@ -304,7 +304,7 @@ TODO list:
#ifndef MASTER
#include "../srclib/myisammrg/myrg_def.h"
#else
#include "../myisammrg/myrg_def.h"
#include "../storage/myisammrg/myrg_def.h"
#endif
#ifdef EMBEDDED_LIBRARY
......
storage/heap/Makefile.am
View file @ 14076ac4
......@@ -15,8 +15,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES = -I$(top_srcdir)/include
LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
../strings/libmystrings.a
LDADD = libheap.a $(top_srcdir)/mysys/libmysys.a \
$(top_srcdir)/dbug/libdbug.a \
$(top_srcdir)/strings/libmystrings.a
pkglib_LIBRARIES = libheap.a
noinst_PROGRAMS = hp_test1 hp_test2
hp_test1_LDFLAGS = @NOINST_LDFLAGS@
......
storage/innobase/include/Makefile.i
View file @ 14076ac4
# Makefile included in Makefile.am in every subdirectory
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include -I../../include
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/../../include
# Don't update the files from bitkeeper
%::SCCS/s.%
storage/myisammrg/myrg_def.h
View file @ 14076ac4
......@@ -17,7 +17,7 @@
/* This file is included by all myisam-merge files */
#ifndef N_MAXKEY
#include "../storage/myisam/myisamdef.h"
#include "../myisam/myisamdef.h"
#endif
#include "myisammrg.h"
......
storage/ndb/Makefile.am
View file @ 14076ac4
......@@ -2,7 +2,7 @@ SUBDIRS = src tools . include @ndb_opt_subdirs@
DIST_SUBDIRS = src tools include test docs
EXTRA_DIST = config ndbapi-examples
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
dist-hook:
-rm -rf `find $(distdir) -type d -name SCCS`
......@@ -26,5 +26,5 @@ windoze-dsp:
all-windoze-dsp: windoze
find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
$(top_srcdir)/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
$(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
storage/ndb/config/common.mk.am
View file @ 14076ac4
......@@ -2,11 +2,11 @@ ndbbindir = "$(libexecdir)"
ndbtoolsdir = "$(bindir)"
ndbtestdir = "$(bindir)"
ndblibdir = "$(pkglibdir)"
ndbincludedir = "$(pkgincludedir)/ndb"
ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
ndbincludedir = "$(pkgincludedir)/storage/ndb"
ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi"
mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi"
INCLUDES = $(INCLUDES_LOC)
LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
LDADD = $(top_srcdir)/storage/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
storage/ndb/config/type_kernel.mk.am
View file @ 14076ac4
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
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/src/kernel/vm \
-I$(top_srcdir)/storage/ndb/src/kernel/error \
-I$(top_srcdir)/storage/ndb/src/kernel \
-I$(top_srcdir)/storage/ndb/include/kernel \
-I$(top_srcdir)/storage/ndb/include/transporter \
-I$(top_srcdir)/storage/ndb/include/debugger \
-I$(top_srcdir)/storage/ndb/include/mgmapi \
-I$(top_srcdir)/storage/ndb/include/mgmcommon \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
-I$(top_srcdir)/storage/ndb/include/util \
-I$(top_srcdir)/storage/ndb/include/portlib \
-I$(top_srcdir)/storage/ndb/include/logger
#AM_LDFLAGS = @ndb_ldflags@
storage/ndb/config/type_mgmapiclient.mk.am
View file @ 14076ac4
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi
INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi
storage/ndb/config/type_ndbapi.mk.am
View file @ 14076ac4
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
-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/kernel \
-I$(top_srcdir)/storage/ndb/include/transporter \
-I$(top_srcdir)/storage/ndb/include/debugger \
-I$(top_srcdir)/storage/ndb/include/mgmapi \
-I$(top_srcdir)/storage/ndb/include/mgmcommon \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
-I$(top_srcdir)/storage/ndb/include/util \
-I$(top_srcdir)/storage/ndb/include/portlib \
-I$(top_srcdir)/storage/ndb/include/logger
storage/ndb/config/type_ndbapiclient.mk.am
View file @ 14076ac4
INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi
INCLUDES += -I$(top_srcdir)/storage/ndb/include/ndbapi
storage/ndb/config/type_ndbapitest.mk.am
View file @ 14076ac4
LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
$(top_builddir)/ndb/src/libndbclient.la \
LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
INCLUDES += -I$(top_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
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
-I$(top_srcdir)/storage/ndb/include/util \
-I$(top_srcdir)/storage/ndb/include/portlib \
-I$(top_srcdir)/storage/ndb/test/include \
-I$(top_srcdir)/storage/ndb/include/mgmapi
storage/ndb/config/type_ndbapitools.mk.am
View file @ 14076ac4
LDADD += \
$(top_builddir)/ndb/src/libndbclient.la \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
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 \
-I$(top_srcdir)/ndb/include/kernel
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
-I$(top_srcdir)/storage/ndb/include/util \
-I$(top_srcdir)/storage/ndb/include/portlib \
-I$(top_srcdir)/storage/ndb/test/include \
-I$(top_srcdir)/storage/ndb/include/mgmapi \
-I$(top_srcdir)/storage/ndb/include/kernel
storage/ndb/config/type_util.mk.am
View file @ 14076ac4
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
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/util \
-I$(top_srcdir)/storage/ndb/include/portlib \
-I$(top_srcdir)/storage/ndb/include/logger
storage/ndb/docs/Makefile.am
View file @ 14076ac4
......@@ -47,8 +47,8 @@ ndbapi.html: $(noinst_HEADERS)
@RM@ -f ndbapi.pdf ndbapi.html; \
@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
mkdir -p $(DOXYTMP) $(DOXYOUT); \
@CP@ $(top_srcdir)/ndb/include/ndbapi/* $(DOXYTMP); \
@CP@ $(top_srcdir)/ndb/ndbapi-examples/*/*.[ch]pp $(DOXYTMP); \
@CP@ $(top_srcdir)/storage/ndb/include/ndbapi/* $(DOXYTMP); \
@CP@ $(top_srcdir)/storage/ndb/ndbapi-examples/*/*.[ch]pp $(DOXYTMP); \
@PERL@ $(DOXYDIR)/predoxy.pl; \
mv footer.html $(DOXYTMP); \
(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
......@@ -74,7 +74,7 @@ mgmapi.html: $(noinst_HEADERS)
@RM@ -f mgmapi.pdf mgmapi.html; \
@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
mkdir -p $(DOXYTMP) $(DOXYOUT); \
@CP@ $(top_srcdir)/ndb/include/mgmapi/* $(DOXYTMP); \
@CP@ $(top_srcdir)/storage/ndb/include/mgmapi/* $(DOXYTMP); \
@PERL@ $(DOXYDIR)/predoxy.pl; \
mv footer.html $(DOXYTMP); \
(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \
......@@ -97,7 +97,7 @@ mgmapi.pdf: mgmapi.html
# src/client
ndbdoc: DUMMY
mkdir -p $(OUTDIR)
cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
###
#
......@@ -105,10 +105,10 @@ ndbdoc: DUMMY
odbcdoc: DUMMY
mkdir -p $(OUTDIR)
cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
testdoc: DUMMY
mkdir -p $(OUTDIR)
cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
windoze-dsp:
storage/ndb/include/Makefile.am
View file @ 14076ac4
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
ndbinclude_HEADERS = \
ndb_constants.h \
......
storage/ndb/src/Makefile.am
View file @ 14076ac4
SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
ndblib_LTLIBRARIES = libndbclient.la
......@@ -20,14 +20,14 @@ libndbclient_la_LIBADD = \
windoze-dsp: libndbclient.dsp
libndbclient.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ dummy.cpp
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
@touch dummy.cpp
storage/ndb/src/common/debugger/Makefile.am
View file @ 14076ac4
......@@ -4,8 +4,8 @@ noinst_LTLIBRARIES = libtrace.la
libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp GrepError.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libtrace.dsp
libtrace.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/common/debugger/signaldata/Makefile.am
View file @ 14076ac4
......@@ -26,8 +26,8 @@ libsignaldataprint_la_SOURCES = \
LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp \
ScanFrag.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -35,13 +35,13 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
windoze-dsp: libsignaldataprint.dsp
libsignaldataprint.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libsignaldataprint_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libsignaldataprint_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/common/logger/Makefile.am
View file @ 14076ac4
......@@ -5,21 +5,21 @@ SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
ConsoleLogHandler.cpp FileLogHandler.cpp
liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: liblogger.dsp
liblogger.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(SOURCE_WIN)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(SOURCE_WIN)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/common/mgmcommon/Makefile.am
View file @ 14076ac4
......@@ -4,11 +4,11 @@ libmgmsrvcommon_la_SOURCES = \
ConfigRetriever.cpp \
IPCConfig.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/src/mgmsrv
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -16,13 +16,13 @@ include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
windoze-dsp: libmgmsrvcommon.dsp
libmgmsrvcommon.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/common/portlib/Makefile.am
View file @ 14076ac4
......@@ -8,8 +8,8 @@ libportlib_la_SOURCES = \
NdbDaemon.c NdbMem.c \
NdbConfig.c
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
EXTRA_PROGRAMS = memtest PortLibTest munmaptest
......@@ -31,13 +31,13 @@ WIN_src = win32/NdbCondition.c \
windoze-dsp: libportlib.dsp
libportlib.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(WIN_src)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/common/transporter/Makefile.am
View file @ 14076ac4
......@@ -13,10 +13,10 @@ EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp S
libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/include/debugger -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/include/transporter @NDB_SCI_INCLUDES@
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -24,13 +24,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am
windoze-dsp: libtransporter.dsp
libtransporter.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/common/util/Makefile.am
View file @ 14076ac4
......@@ -15,7 +15,7 @@ libgeneral_la_SOURCES = \
EXTRA_PROGRAMS = testBitmask
testBitmask_SOURCES = testBitmask.cpp
testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/ndb/src/libndbclient.la \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a
......@@ -28,8 +28,8 @@ testBitmask.o: $(testBitmask_SOURCES)
$(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $<
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -37,13 +37,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am
windoze-dsp: libgeneral.dsp
libgeneral.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libgeneral_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgeneral_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/cw/cpcd/Makefile.am
View file @ 14076ac4
......@@ -4,13 +4,13 @@ ndbbin_PROGRAMS = ndb_cpcd
ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
LDADD_LOC = \
$(top_builddir)/ndb/src/libndbclient.la \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
ndb_cpcd_LDFLAGS = @ndb_bin_am_ldflags@
......
storage/ndb/src/kernel/Makefile.am
View file @ 14076ac4
SUBDIRS = error blocks vm
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
ndbbin_PROGRAMS = ndbd
ndbd_SOURCES = main.cpp SimBlockList.cpp
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
INCLUDES += \
-Iblocks/cmvmi \
......@@ -45,14 +45,14 @@ LDADD += \
blocks/dbtux/libdbtux.a \
vm/libkernel.a \
error/liberror.a \
$(top_builddir)/ndb/src/common/transporter/libtransporter.la \
$(top_builddir)/ndb/src/common/debugger/libtrace.la \
$(top_builddir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
$(top_builddir)/ndb/src/common/logger/liblogger.la \
$(top_builddir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
$(top_builddir)/ndb/src/mgmapi/libmgmapi.la \
$(top_builddir)/ndb/src/common/portlib/libportlib.la \
$(top_builddir)/ndb/src/common/util/libgeneral.la \
$(top_builddir)/storage/ndb/src/common/transporter/libtransporter.la \
$(top_builddir)/storage/ndb/src/common/debugger/libtrace.la \
$(top_builddir)/storage/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
$(top_builddir)/storage/ndb/src/common/logger/liblogger.la \
$(top_builddir)/storage/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
$(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
$(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
$(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
......@@ -62,14 +62,14 @@ LDADD += \
windoze-dsp: ndbd.dsp
ndbd.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndbd_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
storage/ndbd.dsp: Makefile \
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
storage/ndb/src/kernel/blocks/backup/Makefile.am
View file @ 14076ac4
......@@ -3,8 +3,8 @@ noinst_LIBRARIES = libbackup.a
libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -12,13 +12,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libbackup.dsp
libbackup.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/cmvmi/Makefile.am
View file @ 14076ac4
......@@ -3,8 +3,8 @@ noinst_LIBRARIES = libcmvmi.a
libcmvmi_a_SOURCES = Cmvmi.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -12,13 +12,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libcmvmi.dsp
libcmvmi.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbacc/Makefile.am
View file @ 14076ac4
......@@ -3,10 +3,10 @@ noinst_LIBRARIES = libdbacc.a
libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -14,13 +14,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbacc.dsp
libdbacc.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbdict/Makefile.am
View file @ 14076ac4
......@@ -4,8 +4,8 @@ noinst_LIBRARIES = libdbdict.a
libdbdict_a_SOURCES = Dbdict.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbdict.dsp
libdbdict.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbdih/Makefile.am
View file @ 14076ac4
......@@ -2,8 +2,8 @@ noinst_LIBRARIES = libdbdih.a
libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbdih.dsp
libdbdih.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dblqh/Makefile.am
View file @ 14076ac4
......@@ -4,8 +4,8 @@ noinst_LIBRARIES = libdblqh.a
libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdblqh.dsp
libdblqh.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbtc/Makefile.am
View file @ 14076ac4
......@@ -2,8 +2,8 @@ noinst_LIBRARIES = libdbtc.a
libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbtc.dsp
libdbtc.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbtup/Makefile.am
View file @ 14076ac4
......@@ -20,8 +20,8 @@ libdbtup_a_SOURCES = \
DbtupIndex.cpp \
DbtupDebug.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -29,13 +29,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbtup.dsp
libdbtup.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbtux/Makefile.am
View file @ 14076ac4
......@@ -11,10 +11,10 @@ libdbtux_a_SOURCES = \
DbtuxCmp.cpp \
DbtuxDebug.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -22,13 +22,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbtux.dsp
libdbtux.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/dbutil/Makefile.am
View file @ 14076ac4
......@@ -2,8 +2,8 @@ noinst_LIBRARIES = libdbutil.a
libdbutil_a_SOURCES = DbUtil.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libdbutil.dsp
libdbutil.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/grep/Makefile.am
View file @ 14076ac4
......@@ -2,8 +2,8 @@ noinst_LIBRARIES = libgrep.a
libgrep_a_SOURCES = Grep.cpp GrepInit.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libgrep.dsp
libgrep.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libgrep_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgrep_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am
View file @ 14076ac4
......@@ -5,8 +5,8 @@ libndbcntr_a_SOURCES = \
NdbcntrSysTable.cpp \
NdbcntrMain.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -14,13 +14,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libndbcntr.dsp
libndbcntr.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbcntr_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libstorage/ndbcntr_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/ndbfs/Makefile.am
View file @ 14076ac4
......@@ -6,8 +6,8 @@ libndbfs_a_SOURCES = \
Filename.cpp \
CircularIndex.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -15,13 +15,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libndbfs.dsp
libndbfs.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbfs_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libstorage/ndbfs_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/qmgr/Makefile.am
View file @ 14076ac4
......@@ -4,8 +4,8 @@ libqmgr_a_SOURCES = \
QmgrInit.cpp \
QmgrMain.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libqmgr.dsp
libqmgr.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/suma/Makefile.am
View file @ 14076ac4
......@@ -2,8 +2,8 @@ noinst_LIBRARIES = libsuma.a
libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libsuma.dsp
libsuma.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/blocks/trix/Makefile.am
View file @ 14076ac4
......@@ -2,8 +2,8 @@ noinst_LIBRARIES = libtrix.a
libtrix_a_SOURCES = Trix.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libtrix.dsp
libtrix.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/error/Makefile.am
View file @ 14076ac4
......@@ -4,8 +4,8 @@ liberror_a_SOURCES = TimeModule.cpp \
ErrorReporter.cpp \
ErrorMessages.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: liberror.dsp
liberror.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(liberror_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(liberror_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/kernel/vm/Makefile.am
View file @ 14076ac4
......@@ -20,10 +20,10 @@ libkernel_a_SOURCES = \
MetaData.cpp \
Mutex.cpp SafeCounter.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -31,13 +31,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am
windoze-dsp: libkernel.dsp
libkernel.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/mgmapi/Makefile.am
View file @ 14076ac4
......@@ -3,12 +3,12 @@ noinst_LTLIBRARIES = libmgmapi.la
libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi
DEFS_LOC = -DNO_DEBUG_MESSAGES -DNDB_PORT="\"@ndb_port@\""
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
#ndbtest_PROGRAMS = ndb_test_mgmapi
......@@ -18,13 +18,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am
windoze-dsp: libmgmapi.dsp
libmgmapi.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/src/mgmclient/Makefile.am
View file @ 14076ac4
......@@ -12,11 +12,11 @@ libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
ndb_mgm_SOURCES = main.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \
-I$(top_srcdir)/ndb/src/common/mgmcommon
INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
-I$(top_srcdir)/storage/ndb/src/common/mgmcommon
LDADD_LOC = $(noinst_LTLIBRARIES) \
../common/portlib/libportlib.la \
......@@ -34,25 +34,25 @@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
ndb_mgm.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
libndbmgmclient.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
storage/ndb/src/mgmsrv/Makefile.am
View file @ 14076ac4
......@@ -18,13 +18,13 @@ ndb_mgmd_SOURCES = \
InitConfigFileParser.cpp \
Config.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
-I$(top_srcdir)/ndb/src/mgmapi \
-I$(top_srcdir)/ndb/src/common/mgmcommon \
-I$(top_srcdir)/ndb/src/mgmclient
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \
-I$(top_srcdir)/storage/ndb/src/mgmapi \
-I$(top_srcdir)/storage/ndb/src/common/mgmcommon \
-I$(top_srcdir)/storage/ndb/src/mgmclient
LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CommandInterpreter.o \
$(top_builddir)/ndb/src/libndbclient.la \
LDADD_LOC = $(top_srcdir)/storage/ndb/src/mgmclient/CommandInterpreter.o \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
......@@ -37,8 +37,8 @@ DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
......@@ -48,13 +48,13 @@ ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
windoze-dsp: ndb_mgmd.dsp
ndb_mgmd.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
storage/ndb/src/ndbapi/Makefile.am
View file @ 14076ac4
......@@ -36,13 +36,13 @@ libndbapi_la_SOURCES = \
ndb_cluster_connection.cpp \
NdbBlob.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
# Ndbapi cannot handle -O3
NDB_CXXFLAGS_RELEASE_LOC = -O2
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -50,13 +50,13 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
windoze-dsp: libndbapi.dsp
libndbapi.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
storage/ndb/test/ndbapi/Makefile.am
View file @ 14076ac4
......@@ -79,10 +79,10 @@ DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterfa
DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
test_event_multi_table_SOURCES = test_event_multi_table.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
......@@ -99,61 +99,61 @@ windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
testScan.dsp
flexBench.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ flexBench
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ flexBench
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(flexBench_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testBasic.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ testBasic
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testBasic
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBasic_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testOIBasic.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ testOIBasic
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testOIBasic
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testBlobs.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ testBlobs
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testBlobs
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBlobs_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testScan.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ testScan
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testScan
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
storage/ndb/test/ndbapi/bank/Makefile.am
View file @ 14076ac4
......@@ -15,8 +15,8 @@ bankTimer_SOURCES = bankTimer.cpp
LDADD_LOC = $(noinst_LIBRARIES)
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......
storage/ndb/test/run-test/Makefile.am
View file @ 14076ac4
testdir=$(prefix)/mysql-test/ndb
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
test_PROGRAMS = atrt
test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt
......@@ -11,9 +11,9 @@ test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh
atrt_SOURCES = main.cpp run-test.hpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include
LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
$(top_builddir)/ndb/src/libndbclient.la \
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
......
storage/ndb/test/src/Makefile.am
View file @ 14076ac4
......@@ -12,10 +12,10 @@ libNDBT_a_SOURCES = \
NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c \
CpcClient.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/src/mgmapi
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/storage/ndb/include/mgmcommon -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/src/mgmapi
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
......@@ -23,13 +23,13 @@ include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
windoze-dsp: libNDBT.dsp
libNDBT.dsp: Makefile \
$(top_srcdir)/ndb/config/win-lib.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
$(top_srcdir)/storage/ndb/config/win-lib.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
storage/ndb/test/tools/Makefile.am
View file @ 14076ac4
......@@ -19,8 +19,8 @@ copy_tab_SOURCES = copy_tab.cpp
create_index_SOURCES = create_index.cpp
ndb_cpcc_SOURCES = cpcc.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
ndb_cpcc_LDADD = $(LDADD)
......
storage/ndb/tools/Makefile.am
View file @ 14076ac4
......@@ -32,8 +32,8 @@ ndb_restore_SOURCES = restore/restore_main.cpp \
restore/consumer_printer.cpp \
restore/Restore.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitools.mk.am
ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
......@@ -60,97 +60,97 @@ windoze-dsp: \
ndb_select_count.dsp
ndb_waiter.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_waiter
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_waiter
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_drop_table.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_table
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_table
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_delete_all.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_delete_all
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_delete_all
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_desc.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_desc
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_desc
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_drop_index.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_index
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_index
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_show_tables.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_show_tables
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_show_tables
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_select_all.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_select_all
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_all
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
ndb_select_count.dsp: Makefile \
$(top_srcdir)/ndb/config/win-prg.am \
$(top_srcdir)/ndb/config/win-name \
$(top_srcdir)/ndb/config/win-includes \
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-prg.am > $@
@$(top_srcdir)/ndb/config/win-name $@ ndb_select_count
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
$(top_srcdir)/storage/ndb/config/win-prg.am \
$(top_srcdir)/storage/ndb/config/win-name \
$(top_srcdir)/storage/ndb/config/win-includes \
$(top_srcdir)/storage/ndb/config/win-sources \
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_count
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7