Merge poseidon.(none):/home/tomas/mysql-4.1-ndb

into poseidon.(none):/home/tomas/mysql-4.1-ndb-make

acinclude.m4

@@ -1355,7 +1355,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       AC_DEFINE(HAVE_NDBCLUSTER_DB)
       have_ndbcluster="yes"
       ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
-      ndbcluster_libs="\$(top_builddir)/ndb/lib/libNDB_API.a"
+      ndbcluster_libs="\$(top_builddir)/ndb/src/ndbapi/libNDB_API.la"
       ndbcluster_system_libs=""
       ;;
     * )

configure.in

@@ -1615,15 +1615,19 @@ then
   # Medium debug.
   CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
   CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
+  #NDB_DEFS="-DNDB_RELEASE -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
+  NDB_DEFS="-DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
 elif test "$with_debug" = "full"
 then
   # Full debug. Very slow in some cases
   CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
   CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
+  NDB_DEFS="-DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
 else
   # Optimized version. No debug
   CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
   CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
+  NDB_DEFS="-DNDB_RELEASE -DUSE_EMULATED_JAM -DNDEBUG"
 fi
 
 # Force static compilation to avoid linking problems/get more speed
@@ -2763,15 +2767,6 @@ EOF
       exit 1
     fi
     sql_server_dirs="$sql_server_dirs ndb"
-    echo "CONFIGURING FOR NDB CLUSTER" 
-    case $with_debug in
-    no) flag="-R" ;;
-    *)  flag="-D" ;;
-    esac
-    flag="$flag --VERSION=$VERSION --PACKAGE=$PACKAGE"
-    (cd ndb && ./configure $flag) \
-    || AC_MSG_ERROR([could not configure NDB Cluster])
-    echo "END OF NDB CLUSTER CONFIGURATION"
   fi
   #
   # END of configuration for optional table handlers
@@ -2834,14 +2829,122 @@ case $SYSTEM_TYPE in
     MAKE_BINARY_DISTRIBUTION_OPTIONS=
     ;;
 esac
+
 if test X"$have_ndbcluster" = Xyes
 then
   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
+
+  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
 fi
+
+  NDB_UTIL_INCLUDES="-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
+        -I\$(top_srcdir)/ndb/include/util \
+        -I\$(top_srcdir)/ndb/include/portlib \
+        -I\$(top_srcdir)/ndb/include/logger"
+  NDB_KERNEL_INCLUDES="\
+        -I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
+        -I\$(top_srcdir)/ndb/src/kernel/vm \
+        -I\$(top_srcdir)/ndb/src/kernel/error \
+	-I\$(top_srcdir)/ndb/src/kernel \
+	-I\$(top_srcdir)/ndb/include/kernel \
+	-I\$(top_srcdir)/ndb/include/transporter \
+	-I\$(top_srcdir)/ndb/include/debugger \
+	-I\$(top_srcdir)/ndb/include/mgmcommon \
+        -I\$(top_srcdir)/ndb/include/ndbapi \
+        -I\$(top_srcdir)/ndb/include/util \
+	-I\$(top_srcdir)/ndb/include/portlib \
+	-I\$(top_srcdir)/ndb/include/logger"
+  NDB_NDBAPI_INCLUDES="\
+        -I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
+	-I\$(top_srcdir)/ndb/include/kernel \
+	-I\$(top_srcdir)/ndb/include/transporter \
+	-I\$(top_srcdir)/ndb/include/debugger \
+	-I\$(top_srcdir)/ndb/include/mgmcommon \
+        -I\$(top_srcdir)/ndb/include/ndbapi \
+        -I\$(top_srcdir)/ndb/include/util \
+	-I\$(top_srcdir)/ndb/include/portlib \
+	-I\$(top_srcdir)/ndb/include/logger"
+  NDB_NDBAPITEST_INCLUDES="\
+        -I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
+        -I\$(top_srcdir)/ndb/include/ndbapi \
+        -I\$(top_srcdir)/ndb/include/util \
+	-I\$(top_srcdir)/ndb/include/portlib \
+	-I\$(top_srcdir)/ndb/test/include \
+	-I\$(top_srcdir)/ndb/include/mgmapi"
+  NDB_NDBAPICLIENT_INCLUDES="-I\$(top_srcdir)/ndb/include/ndbapi"
+  NDB_MGMAPICLIENT_INCLUDES="-I\$(top_srcdir)/ndb/include/mgmapi"
+
+  AC_SUBST(NDB_DEFS)
+  AC_SUBST(NDB_UTIL_INCLUDES)
+
+  AC_SUBST(NDB_UTIL_INCLUDES)
+  AC_SUBST(NDB_KERNEL_INCLUDES)
+  AC_SUBST(NDB_NDBAPI_INCLUDES)
+  AC_SUBST(NDB_NDBAPITEST_INCLUDES)
+  AC_SUBST(NDB_NDBAPICLIENT_INCLUDES)
+  AC_SUBST(NDB_MGMAPICLIENT_INCLUDES)
+
+  #NDB_TYPE_COMMON="include \$(top_srcdir)/ndb/config/common.mk.am"
+  #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapi.mk.am"
+  #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapitest.mk.am"
+  #NDB_TYPE_KERNEL="include \$(top_srcdir)/ndb/config/type_kernel.mk.am"
+  #NDB_TYPE_UTIL="include \$(top_srcdir)/ndb/config/type_util.mk.am"
+  #AC_SUBST(NDB_TYPE_COMMON)
+  #AC_SUBST(NDB_TYPE_NDBAPI)
+  #AC_SUBST(NDB_TYPE_NDBAPITEST)
+  #AC_SUBST(NDB_TYPE_KERNEL)
+  #AC_SUBST(NDB_TYPE_UTIL)
+
+  define(NDB_MAKEFILES, [ dnl
+   ndb/Makefile ndb/include/Makefile ndb/src/Makefile ndb/src/common/Makefile dnl
+   ndb/tools/Makefile dnl
+   ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl
+   ndb/src/common/util/Makefile dnl
+   ndb/src/common/logger/Makefile dnl
+   ndb/src/common/transporter/Makefile dnl
+   ndb/src/common/mgmcommon/Makefile dnl
+   ndb/src/common/editline/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/backup/restore/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/kernel/ndb-main/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 dnl
+   ])
+
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results
 AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
+ NDB_MAKEFILES dnl
  strings/Makefile regex/Makefile heap/Makefile dnl
  bdb/Makefile dnl
  myisam/Makefile myisammrg/Makefile dnl

ndb/Makefile.am

@@ -0,0 +1,6 @@
+## find * -name '*.hpp' -print | grep -v SCCS | grep -v odbc | sed 's/\.hpp/\.hpp \\/' > tmp.out
+## find * -name '*.h' -print | grep -v SCCS | grep -v odbc | sed 's/\.h/\.h \\/' >> tmp.out
+
+SUBDIRS = . include src test tools
+
+noinst_HEADERS =

ndb/config/common.mk.am

@@ -0,0 +1,17 @@
+
+INCLUDES = $(INCLUDES_LOC)
+LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
+DEFS = @DEFS@ @NDB_DEFS@
+# ndb cannot be compiled with -fno-implicit-templaces
+NDB_CXXFLAGS=-fimplicit-templates
+##use AM_CXXFLAGS for other flags
+
+#noinst_SCRIPTS = ndb_local_bin
+ndb_local_bin: $(PROGRAMS)
+	set -x; \
+	for f in $(PROGRAMS); do \
+	  g=lib/`basename $$f`; \
+	  rm -f $$g; \
+	  @LN_CP_F@ $$f; \
+	done; \
+	touch $@;

ndb/config/type_kernel.mk.am

@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_KERNEL_INCLUDES@

ndb/config/type_mgmapiclient.mk.am

@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_MGMAPICLIENT_INCLUDES@

ndb/config/type_ndbapi.mk.am

@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_NDBAPI_INCLUDES@

ndb/config/type_ndbapiclient.mk.am

@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_NDBAPICLIENT_INCLUDES@

ndb/config/type_ndbapitest.mk.am

@@ -0,0 +1,6 @@
+
+LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
+         $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \
+         $(top_srcdir)/ndb/src/mgmapi/libMGM_API.la
+
+INCLUDES += @NDB_NDBAPITEST_INCLUDES@

ndb/config/type_util.mk.am

@@ -0,0 +1,7 @@
+
+LDADD += \
+              $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
+              $(top_srcdir)/ndb/src/common/util/libgeneral.la \
+              $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la
+
+INCLUDES += @NDB_UTIL_INCLUDES@

ndb/src/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = common mgmapi ndbapi kernel mgmsrv mgmclient cw

ndb/src/common/Makefile.am

@@ -0,0 +1,13 @@
+SUBDIRS =	portlib debugger util logger transporter mgmcommon editline
+
+noinst_LTLIBRARIES = libcommon.la
+
+libcommon_la_SOURCES =
+libcommon_la_LIBADD = \
+              transporter/libtransporter.la   \
+              debugger/libtrace.la     \
+              debugger/signaldata/libsignaldataprint.la \
+              mgmcommon/libmgmsrvcommon.la \
+              portlib/unix/libportlib.la      \
+              logger/liblogger.la       \
+              util/libgeneral.la 

ndb/src/common/debugger/Makefile.am

@@ -0,0 +1,11 @@
+SUBDIRS = signaldata
+
+noinst_LTLIBRARIES = libtrace.la
+
+libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp LogLevel.cpp EventLogger.cpp GrepError.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/debugger/signaldata/Makefile.am

@@ -0,0 +1,32 @@
+
+noinst_LTLIBRARIES = libsignaldataprint.la
+
+libsignaldataprint_la_SOURCES = \
+          TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp \
+	  TcRollbackRep.cpp \
+          TupKey.cpp TupCommit.cpp LqhKey.cpp \
+          FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp\
+          SignalDataPrint.cpp SignalNames.cpp \
+          ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp \
+          CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp \
+	  GCPSave.cpp DictTabInfo.cpp \
+	  AlterTable.cpp AlterTab.cpp \
+	  CreateTrig.cpp AlterTrig.cpp DropTrig.cpp \
+	  FireTrigOrd.cpp TrigAttrInfo.cpp \
+	  CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp \
+	  IndxKeyInfo.cpp IndxAttrInfo.cpp \
+          FsAppendReq.cpp ScanTab.cpp \
+          BackupImpl.cpp BackupSignalData.cpp \
+          UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp \
+          LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp \
+          CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp \
+          FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
+          SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
+	  UtilLock.cpp TuxMaint.cpp TupAccess.cpp AccLock.cpp \
+          LqhTrans.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/editline/Makefile.am

@@ -0,0 +1,10 @@
+
+noinst_LIBRARIES = libeditline.a
+
+libeditline_a_SOURCES = complete.c editline.c sysunix.c
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include
+DEFS = -DANSI_ARROWS -DHAVE_TCGETATTR -DSYS_UNIX
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/logger/Makefile.am

@@ -0,0 +1,11 @@
+
+noinst_LTLIBRARIES = liblogger.la
+
+liblogger_la_SOURCES = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
+           ConsoleLogHandler.cpp FileLogHandler.cpp SysLogHandler.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/mgmcommon/Makefile.am

@@ -0,0 +1,16 @@
+noinst_LTLIBRARIES = libmgmsrvcommon.la
+
+libmgmsrvcommon_la_SOURCES = \
+	LocalConfig.cpp \
+	Config.cpp \
+	ConfigInfo.cpp \
+	ConfigRetriever.cpp \
+	InitConfigFileParser.cpp \
+	IPCConfig.cpp NdbConfig.c
+
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/portlib/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS =	unix

ndb/src/common/portlib/unix/Makefile.am

@@ -0,0 +1,13 @@
+
+noinst_LTLIBRARIES = libportlib.la
+
+libportlib_la_SOURCES = \
+	NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \
+	NdbEnv.c NdbThread.c NdbHost.c NdbTCP.c	    \
+	NdbDaemon.c NdbMem.c
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_util.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/transporter/Makefile.am

@@ -0,0 +1,17 @@
+
+noinst_LTLIBRARIES = libtransporter.la
+
+libtransporter_la_SOURCES = \
+	Transporter.cpp \
+	SendBuffer.cpp   \
+	TCP_Transporter.cpp \
+	TransporterRegistry.cpp \
+        Packer.cpp \
+	SHM_Transporter.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_util.mk.am
+INCLUDES += -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/common/util/Makefile.am

@@ -0,0 +1,16 @@
+
+noinst_LTLIBRARIES = libgeneral.la
+
+libgeneral_la_SOURCES = \
+	    File.cpp md5_hash.cpp Properties.cpp socket_io.cpp \
+            SimpleProperties.cpp Parser.cpp InputStream.cpp SocketServer.cpp \
+	    OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \
+	    NdbSqlUtil.cpp new.cpp \
+            uucode.c random.c getarg.c version.c \
+            strdup.c strlcat.c strlcpy.c
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_util.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/cw/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = cpcd

ndb/src/cw/cpcd/Makefile.am

@@ -0,0 +1,12 @@
+
+bin_PROGRAMS = ndb_cpcd
+
+ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
+
+LDADD_LOC = $(top_srcdir)/ndb/src/common/logger/liblogger.la
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_util.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = error blocks vm ndb-main

ndb/src/kernel/blocks/Makefile.am

@@ -0,0 +1,17 @@
+SUBDIRS = \
+	cmvmi           \
+	dbacc		\
+	dbdict		\
+	dbdih		\
+	dblqh		\
+	dbtc		\
+	dbtup		\
+	ndbfs           \
+	ndbcntr		\
+	qmgr		\
+	trix            \
+        backup          \
+        dbutil          \
+        suma            \
+        grep		\
+	dbtux

ndb/src/kernel/blocks/backup/Makefile.am

@@ -0,0 +1,12 @@
+
+SUBDIRS = restore
+
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/backup/restore/Makefile.am

@@ -0,0 +1,10 @@
+
+bin_PROGRAMS = restore
+
+restore_SOURCES = main.cpp Restore.cpp
+
+LDADD_LOC = $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la
+
+include $(top_srcdir)/ndb/config/common.mk.am
+
+INCLUDES += -I.. -I$(top_srcdir)/include  -I$(top_srcdir)/ndb/include  -I$(top_srcdir)/ndb/src/ndbapi  -I$(top_srcdir)/ndb/include/ndbapi -I$(top_srcdir)/ndb/include/util  -I$(top_srcdir)/ndb/include/portlib -I$(top_srcdir)/ndb/include/kernel

ndb/src/kernel/blocks/cmvmi/Makefile.am

@@ -0,0 +1,10 @@
+
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbacc/Makefile.am

@@ -0,0 +1,10 @@
+
+noinst_LIBRARIES = libdbacc.a
+
+libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbdict/Makefile.am

@@ -0,0 +1,11 @@
+#SUBDIRS = printSchemafile
+
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbdih/Makefile.am

@@ -0,0 +1,9 @@
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dblqh/Makefile.am

@@ -0,0 +1,11 @@
+#SUBDIRS = redoLogReader
+
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbtc/Makefile.am

@@ -0,0 +1,9 @@
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbtup/Makefile.am

@@ -0,0 +1,27 @@
+noinst_LIBRARIES = libdbtup.a
+
+libdbtup_a_SOURCES = \
+        DbtupExecQuery.cpp \
+        DbtupBuffer.cpp \
+        DbtupRoutines.cpp \
+        DbtupCommit.cpp \
+        DbtupFixAlloc.cpp \
+        DbtupTrigger.cpp \
+        DbtupAbort.cpp \
+        DbtupLCP.cpp \
+        DbtupUndoLog.cpp \
+        DbtupPageMap.cpp \
+        DbtupPagMan.cpp  \
+        DbtupStoredProcDef.cpp \
+        DbtupMeta.cpp \
+        DbtupTabDesMan.cpp \
+	DbtupGen.cpp \
+        DbtupSystemRestart.cpp \
+	DbtupIndex.cpp \
+        DbtupDebug.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbtux/Makefile.am

@@ -0,0 +1,17 @@
+noinst_LIBRARIES = libdbtux.a
+
+libdbtux_a_SOURCES = \
+                        DbtuxGen.cpp \
+			DbtuxMeta.cpp \
+			DbtuxMaint.cpp \
+			DbtuxNode.cpp \
+			DbtuxTree.cpp \
+			DbtuxScan.cpp \
+			DbtuxCmp.cpp \
+			DbtuxDebug.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/dbutil/Makefile.am

@@ -0,0 +1,9 @@
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/grep/Makefile.am

@@ -0,0 +1,9 @@
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/ndbcntr/Makefile.am

@@ -0,0 +1,12 @@
+noinst_LIBRARIES = libndbcntr.a
+
+libndbcntr_a_SOURCES = \
+	NdbcntrInit.cpp	\
+	NdbcntrSysTable.cpp \
+	NdbcntrMain.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/ndbfs/Makefile.am

@@ -0,0 +1,13 @@
+noinst_LIBRARIES = libndbfs.a
+
+libndbfs_a_SOURCES = \
+	AsyncFile.cpp			\
+	Ndbfs.cpp VoidFs.cpp	\
+	Filename.cpp			\
+	CircularIndex.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/qmgr/Makefile.am

@@ -0,0 +1,11 @@
+noinst_LIBRARIES = libqmgr.a
+
+libqmgr_a_SOURCES = \
+	QmgrInit.cpp	\
+	QmgrMain.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/suma/Makefile.am

@@ -0,0 +1,9 @@
+pkglib_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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/blocks/trix/Makefile.am

@@ -0,0 +1,9 @@
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/error/Makefile.am

@@ -0,0 +1,11 @@
+pkglib_LIBRARIES = liberror.a
+
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/ndb-main/Makefile.am

@@ -0,0 +1,55 @@
+
+bin_PROGRAMS = ndb
+
+ndb_SOURCES = Main.cpp SimBlockList.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+INCLUDES += \
+              -I../blocks/cmvmi \
+              -I../blocks/dbacc \
+              -I../blocks/dbdict \
+              -I../blocks/dbdih \
+              -I../blocks/dblqh \
+              -I../blocks/dbtc \
+              -I../blocks/dbtup \
+              -I../blocks/ndbfs \
+              -I../blocks/ndbcntr \
+              -I../blocks/qmgr \
+              -I../blocks/trix \
+              -I../blocks/backup \
+              -I../blocks/dbutil \
+              -I../blocks/suma \
+              -I../blocks/grep \
+              -I../blocks/dbtux
+
+LDADD +=  \
+              $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
+              ../blocks/cmvmi/libcmvmi.a \
+              ../blocks/dbacc/libdbacc.a \
+              ../blocks/dbdict/libdbdict.a \
+              ../blocks/dbdih/libdbdih.a \
+              ../blocks/dblqh/libdblqh.a \
+              ../blocks/dbtc/libdbtc.a \
+              ../blocks/dbtup/libdbtup.a \
+              ../blocks/ndbfs/libndbfs.a \
+              ../blocks/ndbcntr/libndbcntr.a \
+              ../blocks/qmgr/libqmgr.a \
+              ../blocks/trix/libtrix.a \
+              ../blocks/backup/libbackup.a \
+              ../blocks/dbutil/libdbutil.a \
+              ../blocks/suma/libsuma.a \
+              ../blocks/grep/libgrep.a \
+              ../blocks/dbtux/libdbtux.a \
+              ../vm/libkernel.a	\
+              ../error/liberror.a \
+              $(top_srcdir)/ndb/src/common/transporter/libtransporter.la   \
+              $(top_srcdir)/ndb/src/common/debugger/libtrace.la     \
+              $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
+              $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
+              $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
+              $(top_srcdir)/ndb/src/common/util/libgeneral.la 
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/kernel/vm/Makefile.am

@@ -0,0 +1,28 @@
+#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
+#ifneq ($(USE_EDITLINE), N)
+#DIRS += testLongSig
+#endif
+
+pkglib_LIBRARIES = libkernel.a
+
+libkernel_a_SOURCES = \
+	SimulatedBlock.cpp	\
+	FastScheduler.cpp		\
+	TimeQueue.cpp		\
+	VMSignal.cpp		\
+	ThreadConfig.cpp          \
+	TransporterCallback.cpp \
+	Emulator.cpp		\
+	Configuration.cpp		\
+	ClusterConfiguration.cpp	\
+	WatchDog.cpp \
+        SimplePropertiesSection.cpp \
+        SectionReader.cpp \
+	MetaData.cpp \
+        Mutex.cpp SafeCounter.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/mgmapi/Makefile.am

@@ -0,0 +1,20 @@
+
+noinst_LTLIBRARIES = libmgmapi.la libMGM_API.la
+
+libmgmapi_la_SOURCES_loc = mgmapi.cpp
+
+libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
+libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_util.mk.am
+INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
+
+DEFS += -DNO_DEBUG_MESSAGES
+
+libMGM_API_la_LIBADD = \
+              $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
+              $(top_srcdir)/ndb/src/common/util/libgeneral.la 
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/mgmclient/Makefile.am

@@ -0,0 +1,23 @@
+
+bin_PROGRAMS = mgmtclient
+
+mgmtclient_SOURCES = \
+	main.cpp \
+	CommandInterpreter.cpp \
+	CpcClient.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
+
+LDADD += \
+	$(top_srcdir)/ndb/src/common/debugger/libtrace.la \
+	$(top_srcdir)/ndb/src/common/logger/liblogger.la \
+	$(top_srcdir)/ndb/src/common/util/libgeneral.la \
+	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
+	$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+	$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
+	$(top_srcdir)/ndb/src/common/editline/libeditline.a
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/mgmsrv/Makefile.am

@@ -0,0 +1,29 @@
+
+bin_PROGRAMS = mgmtsrvr
+
+mgmtsrvr_SOURCES = \
+	MgmtSrvr.cpp \
+	MgmtSrvrGeneralSignalHandling.cpp \
+	main.cpp \
+	Services.cpp \
+	convertStrToInt.cpp \
+        NodeLogLevel.cpp \
+	NodeLogLevelList.cpp \
+	SignalQueue.cpp \
+	MgmtSrvrConfig.cpp \
+	CommandInterpreter.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+INCLUDES += -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
+
+LDADD += \
+	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
+	$(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \
+	$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+	$(top_srcdir)/ndb/src/common/util/libgeneral.la \
+	$(top_srcdir)/ndb/src/common/editline/libeditline.a \
+	@TERMCAP_LIB@
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/src/ndbapi/Makefile.am

@@ -0,0 +1,55 @@
+#SUBDIRS = signal-sender
+
+noinst_LTLIBRARIES = libndbapi.la libNDB_API.la
+
+libndbapi_la_SOURCES_loc = \
+        TransporterFacade.cpp   \
+        ClusterMgr.cpp  \
+        Ndb.cpp \
+        NdbPoolImpl.cpp NdbPool.cpp \
+        Ndblist.cpp     \
+        Ndbif.cpp       \
+        Ndbinit.cpp     \
+        Ndberr.cpp    \
+        ndberror.c    \
+        NdbErrorOut.cpp    \
+        NdbConnection.cpp       \
+        NdbConnectionScan.cpp \
+        NdbOperation.cpp        \
+        NdbOperationSearch.cpp  \
+        NdbOperationScan.cpp    \
+        NdbOperationInt.cpp     \
+        NdbOperationDefine.cpp  \
+        NdbOperationExec.cpp    \
+        NdbScanReceiver.cpp     \
+        NdbResultSet.cpp        \
+        NdbCursorOperation.cpp  \
+        NdbScanOperation.cpp    NdbScanFilter.cpp \
+        NdbIndexOperation.cpp   \
+        NdbEventOperation.cpp   \
+        NdbEventOperationImpl.cpp   \
+        NdbApiSignal.cpp        \
+        NdbRecAttr.cpp  \
+        NdbSchemaCon.cpp        \
+        NdbSchemaOp.cpp \
+        NdbUtil.cpp \
+        NdbReceiver.cpp \
+        NdbDictionary.cpp NdbDictionaryImpl.cpp DictCache.cpp
+
+libndbapi_la_SOURCES = $(libndbapi_la_SOURCES_loc)
+libNDB_API_la_SOURCES = $(libndbapi_la_SOURCES_loc)
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+
+libNDB_API_la_LIBADD =  \
+              $(top_srcdir)/ndb/src/common/transporter/libtransporter.la   \
+              $(top_srcdir)/ndb/src/common/debugger/libtrace.la     \
+              $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
+              $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
+              $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
+              $(top_srcdir)/ndb/src/common/util/libgeneral.la 
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/test/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = src tools ndbapi run-test

ndb/test/ndbapi/Makefile.am

@@ -0,0 +1,79 @@
+
+SUBDIRS = bank
+
+bin_PROGRAMS = \
+flexBench \
+drop_all_tabs \
+create_all_tabs \
+create_tab \
+flexAsynch \
+flexBench \
+flexHammer \
+flexScan \
+flexTT \
+flexTimedAsynch \
+testBackup \
+testBasic \
+testBasicAsynch \
+testDataBuffers \
+testDict \
+testIndex \
+testMgm \
+testNdbApi \
+testNodeRestart \
+testOIBasic \
+testOperations \
+testRestartGci \
+testScan \
+testScanInterpreter \
+testSystemRestart \
+testTimeout \
+testTransactions \
+test_event
+
+#testBlobs
+#flex_bench_mysql
+
+create_all_tabs_SOURCES = create_all_tabs.cpp
+create_tab_SOURCES = create_tab.cpp
+drop_all_tabs_SOURCES = drop_all_tabs.cpp
+flexAsynch_SOURCES = flexAsynch.cpp
+flexBench_SOURCES = flexBench.cpp
+flexHammer_SOURCES = flexHammer.cpp
+flexScan_SOURCES = flexScan.cpp
+flexTT_SOURCES = flexTT.cpp
+flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
+#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
+testBackup_SOURCES = testBackup.cpp
+testBasic_SOURCES = testBasic.cpp
+testBasicAsynch_SOURCES = testBasicAsynch.cpp
+#testBlobs_SOURCES = testBlobs.cpp
+testDataBuffers_SOURCES = testDataBuffers.cpp
+testDict_SOURCES = testDict.cpp
+testIndex_SOURCES = testIndex.cpp
+testMgm_SOURCES = testMgm.cpp
+testNdbApi_SOURCES = testNdbApi.cpp
+testNodeRestart_SOURCES = testNodeRestart.cpp
+testOIBasic_SOURCES = testOIBasic.cpp
+testOperations_SOURCES = testOperations.cpp
+testRestartGci_SOURCES = testRestartGci.cpp
+testScan_SOURCES = testScan.cpp
+testScanInterpreter_SOURCES = testScanInterpreter.cpp
+testSystemRestart_SOURCES = testSystemRestart.cpp
+testTimeout_SOURCES = testTimeout.cpp
+testTransactions_SOURCES = testTransactions.cpp
+test_event_SOURCES = test_event.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
+
+##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+testBackup_LDADD = $(LDADD) bank/libbank.a
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%