101 files changed, 652 insertions, 0 deletions
diff --git a/ndb/Epilogue.mk b/ndb/Epilogue.mk_old
index bcdc54a87f1..bcdc54a87f1 100644
--- a/ndb/Epilogue.mk
+++ b/ndb/Epilogue.mk_old
diff --git a/ndb/Makefile.am b/ndb/Makefile.am
new file mode 100644
index 00000000000..01094f8720a
--- /dev/null
+++ b/ndb/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 	src test
diff --git a/ndb/Makefile b/ndb/Makefile_old
index 8788eae885d..8788eae885d 100644
--- a/ndb/Makefile
+++ b/ndb/Makefile_old
diff --git a/ndb/config/GuessConfig.sh b/ndb/config/GuessConfig.sh_old
index 8c7886401ba..8c7886401ba 100755
--- a/ndb/config/GuessConfig.sh
+++ b/ndb/config/GuessConfig.sh_old
diff --git a/ndb/config/Makefile.am b/ndb/config/Makefile.am_old
index b5fd81814a1..b5fd81814a1 100644
--- a/ndb/config/Makefile.am
+++ b/ndb/config/Makefile.am_old
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am
new file mode 100644
index 00000000000..efeb6aef52f
--- /dev/null
+++ b/ndb/config/common.mk.am
@@ -0,0 +1,7 @@
+
+INCLUDES =
+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
diff --git a/ndb/config/type_kernel.mk.am b/ndb/config/type_kernel.mk.am
new file mode 100644
index 00000000000..c389a64b936
--- /dev/null
+++ b/ndb/config/type_kernel.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_KERNEL_INCLUDES@
diff --git a/ndb/config/type_mgmapiclient.mk.am b/ndb/config/type_mgmapiclient.mk.am
new file mode 100644
index 00000000000..f3bebb2c756
--- /dev/null
+++ b/ndb/config/type_mgmapiclient.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_MGMAPICLIENT_INCLUDES@
diff --git a/ndb/config/type_ndbapi.mk.am b/ndb/config/type_ndbapi.mk.am
new file mode 100644
index 00000000000..864690cec7b
--- /dev/null
+++ b/ndb/config/type_ndbapi.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_NDBAPI_INCLUDES@
diff --git a/ndb/config/type_ndbapiclient.mk.am b/ndb/config/type_ndbapiclient.mk.am
new file mode 100644
index 00000000000..f9655ff9876
--- /dev/null
+++ b/ndb/config/type_ndbapiclient.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_NDBAPICLIENT_INCLUDES@
diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am
new file mode 100644
index 00000000000..5f4a7313986
--- /dev/null
+++ b/ndb/config/type_ndbapitest.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += @NDB_NDBAPITEST_INCLUDES@
diff --git a/ndb/config/type_util.mk.am b/ndb/config/type_util.mk.am
new file mode 100644
index 00000000000..8c9c7e0b504
--- /dev/null
+++ b/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@
diff --git a/ndb/configure b/ndb/configure_old
index f0fc197f45e..f0fc197f45e 100755
--- a/ndb/configure
+++ b/ndb/configure_old
diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am
new file mode 100644
index 00000000000..745a33ccf45
--- /dev/null
+++ b/ndb/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = common mgmapi ndbapi kernel mgmsrv mgmclient cw
diff --git a/ndb/src/Makefile b/ndb/src/Makefile_old
index 4f71eb46056..4f71eb46056 100644
--- a/ndb/src/Makefile
+++ b/ndb/src/Makefile_old
diff --git a/ndb/src/common/Makefile.am b/ndb/src/common/Makefile.am
new file mode 100644
index 00000000000..9ccf6f4350c
--- /dev/null
+++ b/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 
diff --git a/ndb/src/common/Makefile b/ndb/src/common/Makefile_old
index ebde75bf3ec..ebde75bf3ec 100644
--- a/ndb/src/common/Makefile
+++ b/ndb/src/common/Makefile_old
diff --git a/ndb/src/common/debugger/Makefile.am b/ndb/src/common/debugger/Makefile.am
new file mode 100644
index 00000000000..0278d0d2ba0
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/debugger/Makefile b/ndb/src/common/debugger/Makefile_old
index ac3a4475a54..ac3a4475a54 100644
--- a/ndb/src/common/debugger/Makefile
+++ b/ndb/src/common/debugger/Makefile_old
diff --git a/ndb/src/common/debugger/signaldata/Makefile.am b/ndb/src/common/debugger/signaldata/Makefile.am
new file mode 100644
index 00000000000..ee66f39d4fd
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/debugger/signaldata/Makefile b/ndb/src/common/debugger/signaldata/Makefile_old
index 5e86aaf97c0..5e86aaf97c0 100644
--- a/ndb/src/common/debugger/signaldata/Makefile
+++ b/ndb/src/common/debugger/signaldata/Makefile_old
diff --git a/ndb/src/common/editline/Makefile.am b/ndb/src/common/editline/Makefile.am
new file mode 100644
index 00000000000..4f53bdc6326
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/editline/Makefile b/ndb/src/common/editline/Makefile_old
index 800df8f0f31..800df8f0f31 100644
--- a/ndb/src/common/editline/Makefile
+++ b/ndb/src/common/editline/Makefile_old
diff --git a/ndb/src/common/logger/Makefile.am b/ndb/src/common/logger/Makefile.am
new file mode 100644
index 00000000000..0a48214c37c
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/logger/Makefile b/ndb/src/common/logger/Makefile_old
index 994eb86ba35..994eb86ba35 100644
--- a/ndb/src/common/logger/Makefile
+++ b/ndb/src/common/logger/Makefile_old
diff --git a/ndb/src/common/mgmcommon/Makefile.am b/ndb/src/common/mgmcommon/Makefile.am
new file mode 100644
index 00000000000..25c5d11c1c1
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/mgmcommon/Makefile b/ndb/src/common/mgmcommon/Makefile_old
index 2db7be01d60..2db7be01d60 100644
--- a/ndb/src/common/mgmcommon/Makefile
+++ b/ndb/src/common/mgmcommon/Makefile_old
diff --git a/ndb/src/common/portlib/Makefile.am b/ndb/src/common/portlib/Makefile.am
new file mode 100644
index 00000000000..2b1c9eb5ac0
--- /dev/null
+++ b/ndb/src/common/portlib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS =	unix
diff --git a/ndb/src/common/portlib/Makefile b/ndb/src/common/portlib/Makefile_old
index 48f4929a839..48f4929a839 100644
--- a/ndb/src/common/portlib/Makefile
+++ b/ndb/src/common/portlib/Makefile_old
diff --git a/ndb/src/common/portlib/unix/Makefile.am b/ndb/src/common/portlib/unix/Makefile.am
new file mode 100644
index 00000000000..f50d46c1873
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/portlib/unix/Makefile b/ndb/src/common/portlib/unix/Makefile_old
index 452196d9f08..452196d9f08 100644
--- a/ndb/src/common/portlib/unix/Makefile
+++ b/ndb/src/common/portlib/unix/Makefile_old
diff --git a/ndb/src/common/transporter/Makefile.am b/ndb/src/common/transporter/Makefile.am
new file mode 100644
index 00000000000..8c46cc29051
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/transporter/Makefile b/ndb/src/common/transporter/Makefile_old
index 372bf640566..372bf640566 100644
--- a/ndb/src/common/transporter/Makefile
+++ b/ndb/src/common/transporter/Makefile_old
diff --git a/ndb/src/common/util/Makefile.am b/ndb/src/common/util/Makefile.am
new file mode 100644
index 00000000000..a6b3d30ecb2
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/common/util/Makefile b/ndb/src/common/util/Makefile_old
index e8ca2b87c20..e8ca2b87c20 100644
--- a/ndb/src/common/util/Makefile
+++ b/ndb/src/common/util/Makefile_old
diff --git a/ndb/src/cw/Makefile.am b/ndb/src/cw/Makefile.am
new file mode 100644
index 00000000000..b530922a3a7
--- /dev/null
+++ b/ndb/src/cw/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = cpcd
diff --git a/ndb/src/cw/Makefile b/ndb/src/cw/Makefile_old
index e710c1e244d..e710c1e244d 100644
--- a/ndb/src/cw/Makefile
+++ b/ndb/src/cw/Makefile_old
diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am
new file mode 100644
index 00000000000..029ce213987
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/cw/cpcd/Makefile b/ndb/src/cw/cpcd/Makefile_old
index f214fb087d2..f214fb087d2 100644
--- a/ndb/src/cw/cpcd/Makefile
+++ b/ndb/src/cw/cpcd/Makefile_old
diff --git a/ndb/src/kernel/Makefile.am b/ndb/src/kernel/Makefile.am
new file mode 100644
index 00000000000..1e52a561964
--- /dev/null
+++ b/ndb/src/kernel/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = error blocks vm ndb-main
diff --git a/ndb/src/kernel/Makefile b/ndb/src/kernel/Makefile_old
index 11261c047a6..11261c047a6 100644
--- a/ndb/src/kernel/Makefile
+++ b/ndb/src/kernel/Makefile_old
diff --git a/ndb/src/kernel/blocks/Makefile.am b/ndb/src/kernel/blocks/Makefile.am
new file mode 100644
index 00000000000..0b2bc3b8c88
--- /dev/null
+++ b/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
diff --git a/ndb/src/kernel/blocks/Makefile b/ndb/src/kernel/blocks/Makefile_old
index ce554dfc3b8..ce554dfc3b8 100644
--- a/ndb/src/kernel/blocks/Makefile
+++ b/ndb/src/kernel/blocks/Makefile_old
diff --git a/ndb/src/kernel/blocks/backup/Makefile.am b/ndb/src/kernel/blocks/backup/Makefile.am
new file mode 100644
index 00000000000..85bf5b12415
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/backup/Makefile b/ndb/src/kernel/blocks/backup/Makefile_old
index 989199cbe02..989199cbe02 100644
--- a/ndb/src/kernel/blocks/backup/Makefile
+++ b/ndb/src/kernel/blocks/backup/Makefile_old
diff --git a/ndb/src/kernel/blocks/backup/restore/Makefile.am b/ndb/src/kernel/blocks/backup/restore/Makefile.am
new file mode 100644
index 00000000000..d2c8e5a5e4f
--- /dev/null
+++ b/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
diff --git a/ndb/src/kernel/blocks/backup/restore/Makefile b/ndb/src/kernel/blocks/backup/restore/Makefile_old
index 4c884525d73..4c884525d73 100644
--- a/ndb/src/kernel/blocks/backup/restore/Makefile
+++ b/ndb/src/kernel/blocks/backup/restore/Makefile_old
diff --git a/ndb/src/kernel/blocks/cmvmi/Makefile.am b/ndb/src/kernel/blocks/cmvmi/Makefile.am
new file mode 100644
index 00000000000..fdd43932682
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/cmvmi/Makefile b/ndb/src/kernel/blocks/cmvmi/Makefile_old
index d75e5dbf08b..d75e5dbf08b 100644
--- a/ndb/src/kernel/blocks/cmvmi/Makefile
+++ b/ndb/src/kernel/blocks/cmvmi/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbacc/Makefile.am b/ndb/src/kernel/blocks/dbacc/Makefile.am
new file mode 100644
index 00000000000..7ccfbe22f76
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbacc/Makefile b/ndb/src/kernel/blocks/dbacc/Makefile_old
index 93a830cec95..93a830cec95 100644
--- a/ndb/src/kernel/blocks/dbacc/Makefile
+++ b/ndb/src/kernel/blocks/dbacc/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbdict/Makefile.am b/ndb/src/kernel/blocks/dbdict/Makefile.am
new file mode 100644
index 00000000000..dc4c4fe4734
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbdict/Makefile b/ndb/src/kernel/blocks/dbdict/Makefile_old
index 46d938114fb..46d938114fb 100644
--- a/ndb/src/kernel/blocks/dbdict/Makefile
+++ b/ndb/src/kernel/blocks/dbdict/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbdih/Makefile.am b/ndb/src/kernel/blocks/dbdih/Makefile.am
new file mode 100644
index 00000000000..2ee8017ec13
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbdih/Makefile b/ndb/src/kernel/blocks/dbdih/Makefile_old
index 83c1b95b5c4..83c1b95b5c4 100644
--- a/ndb/src/kernel/blocks/dbdih/Makefile
+++ b/ndb/src/kernel/blocks/dbdih/Makefile_old
diff --git a/ndb/src/kernel/blocks/dblqh/Makefile.am b/ndb/src/kernel/blocks/dblqh/Makefile.am
new file mode 100644
index 00000000000..3a58dba742e
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dblqh/Makefile b/ndb/src/kernel/blocks/dblqh/Makefile_old
index 520486d8058..520486d8058 100644
--- a/ndb/src/kernel/blocks/dblqh/Makefile
+++ b/ndb/src/kernel/blocks/dblqh/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbtc/Makefile.am b/ndb/src/kernel/blocks/dbtc/Makefile.am
new file mode 100644
index 00000000000..4aa514c0aba
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbtc/Makefile b/ndb/src/kernel/blocks/dbtc/Makefile_old
index ae876ab1f84..ae876ab1f84 100644
--- a/ndb/src/kernel/blocks/dbtc/Makefile
+++ b/ndb/src/kernel/blocks/dbtc/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbtup/Makefile.am b/ndb/src/kernel/blocks/dbtup/Makefile.am
new file mode 100644
index 00000000000..7e94a01d43b
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbtup/Makefile b/ndb/src/kernel/blocks/dbtup/Makefile_old
index 87146f4b441..87146f4b441 100644
--- a/ndb/src/kernel/blocks/dbtup/Makefile
+++ b/ndb/src/kernel/blocks/dbtup/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbtux/Makefile.am b/ndb/src/kernel/blocks/dbtux/Makefile.am
new file mode 100644
index 00000000000..5ba59e8b3b7
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbtux/Makefile b/ndb/src/kernel/blocks/dbtux/Makefile_old
index 30927c31848..30927c31848 100644
--- a/ndb/src/kernel/blocks/dbtux/Makefile
+++ b/ndb/src/kernel/blocks/dbtux/Makefile_old
diff --git a/ndb/src/kernel/blocks/dbutil/Makefile.am b/ndb/src/kernel/blocks/dbutil/Makefile.am
new file mode 100644
index 00000000000..763875d578f
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/dbutil/Makefile b/ndb/src/kernel/blocks/dbutil/Makefile_old
index 54b7326e4e5..54b7326e4e5 100644
--- a/ndb/src/kernel/blocks/dbutil/Makefile
+++ b/ndb/src/kernel/blocks/dbutil/Makefile_old
diff --git a/ndb/src/kernel/blocks/grep/Makefile.am b/ndb/src/kernel/blocks/grep/Makefile.am
new file mode 100644
index 00000000000..31081c7b6a0
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/grep/Makefile b/ndb/src/kernel/blocks/grep/Makefile_old
index 5ad5a0bce3b..5ad5a0bce3b 100644
--- a/ndb/src/kernel/blocks/grep/Makefile
+++ b/ndb/src/kernel/blocks/grep/Makefile_old
diff --git a/ndb/src/kernel/blocks/ndbcntr/Makefile.am b/ndb/src/kernel/blocks/ndbcntr/Makefile.am
new file mode 100644
index 00000000000..9230b55b374
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/ndbcntr/Makefile b/ndb/src/kernel/blocks/ndbcntr/Makefile_old
index 8e9c4f01027..8e9c4f01027 100644
--- a/ndb/src/kernel/blocks/ndbcntr/Makefile
+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile_old
diff --git a/ndb/src/kernel/blocks/ndbfs/Makefile.am b/ndb/src/kernel/blocks/ndbfs/Makefile.am
new file mode 100644
index 00000000000..c2b663c5042
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/ndbfs/Makefile b/ndb/src/kernel/blocks/ndbfs/Makefile_old
index 58e1458bf16..58e1458bf16 100644
--- a/ndb/src/kernel/blocks/ndbfs/Makefile
+++ b/ndb/src/kernel/blocks/ndbfs/Makefile_old
diff --git a/ndb/src/kernel/blocks/qmgr/Makefile.am b/ndb/src/kernel/blocks/qmgr/Makefile.am
new file mode 100644
index 00000000000..52cadb3bd3d
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/qmgr/Makefile b/ndb/src/kernel/blocks/qmgr/Makefile_old
index cd15643ea60..cd15643ea60 100644
--- a/ndb/src/kernel/blocks/qmgr/Makefile
+++ b/ndb/src/kernel/blocks/qmgr/Makefile_old
diff --git a/ndb/src/kernel/blocks/suma/Makefile.am b/ndb/src/kernel/blocks/suma/Makefile.am
new file mode 100644
index 00000000000..5fc59083484
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/suma/Makefile b/ndb/src/kernel/blocks/suma/Makefile_old
index 20014c94670..20014c94670 100644
--- a/ndb/src/kernel/blocks/suma/Makefile
+++ b/ndb/src/kernel/blocks/suma/Makefile_old
diff --git a/ndb/src/kernel/blocks/trix/Makefile.am b/ndb/src/kernel/blocks/trix/Makefile.am
new file mode 100644
index 00000000000..803da815cf0
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/blocks/trix/Makefile b/ndb/src/kernel/blocks/trix/Makefile_old
index 5ac0da11f33..5ac0da11f33 100644
--- a/ndb/src/kernel/blocks/trix/Makefile
+++ b/ndb/src/kernel/blocks/trix/Makefile_old
diff --git a/ndb/src/kernel/error/Makefile.am b/ndb/src/kernel/error/Makefile.am
new file mode 100644
index 00000000000..5ddf050caaa
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/error/Makefile b/ndb/src/kernel/error/Makefile_old
index 0fe81f083ce..0fe81f083ce 100644
--- a/ndb/src/kernel/error/Makefile
+++ b/ndb/src/kernel/error/Makefile_old
diff --git a/ndb/src/kernel/ndb-main/Makefile.am b/ndb/src/kernel/ndb-main/Makefile.am
new file mode 100644
index 00000000000..f6995ed49a0
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/ndb-main/Makefile b/ndb/src/kernel/ndb-main/Makefile_old
index 29b7ea7e708..29b7ea7e708 100644
--- a/ndb/src/kernel/ndb-main/Makefile
+++ b/ndb/src/kernel/ndb-main/Makefile_old
diff --git a/ndb/src/kernel/vm/Makefile.am b/ndb/src/kernel/vm/Makefile.am
new file mode 100644
index 00000000000..8381fee96df
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/kernel/vm/Makefile b/ndb/src/kernel/vm/Makefile_old
index 3f448b77b17..3f448b77b17 100644
--- a/ndb/src/kernel/vm/Makefile
+++ b/ndb/src/kernel/vm/Makefile_old
diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am
new file mode 100644
index 00000000000..b223478ea56
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/mgmapi/Makefile b/ndb/src/mgmapi/Makefile_old
index 9e7ba4f5ac7..9e7ba4f5ac7 100644
--- a/ndb/src/mgmapi/Makefile
+++ b/ndb/src/mgmapi/Makefile_old
diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am
new file mode 100644
index 00000000000..c57e87d4d50
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/mgmclient/Makefile b/ndb/src/mgmclient/Makefile_old
index 9f9a6344ab9..9f9a6344ab9 100644
--- a/ndb/src/mgmclient/Makefile
+++ b/ndb/src/mgmclient/Makefile_old
diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am
new file mode 100644
index 00000000000..b598ad6f49c
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/mgmsrv/Makefile b/ndb/src/mgmsrv/Makefile_old
index b10bdb64d30..b10bdb64d30 100644
--- a/ndb/src/mgmsrv/Makefile
+++ b/ndb/src/mgmsrv/Makefile_old
diff --git a/ndb/src/ndbapi/Makefile.am b/ndb/src/ndbapi/Makefile.am
new file mode 100644
index 00000000000..3f585be74c6
--- /dev/null
+++ b/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.%
diff --git a/ndb/src/ndbapi/Makefile b/ndb/src/ndbapi/Makefile_old
index f4c82e5d6ba..f4c82e5d6ba 100644
--- a/ndb/src/ndbapi/Makefile
+++ b/ndb/src/ndbapi/Makefile_old
diff --git a/ndb/test/Makefile.am b/ndb/test/Makefile.am
new file mode 100644
index 00000000000..2805ae78984
--- /dev/null
+++ b/ndb/test/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = src ndbapi
+#SUBDIRS = src tools ndbapi run-test
diff --git a/ndb/test/Makefile b/ndb/test/Makefile_old
index 19472917560..19472917560 100644
--- a/ndb/test/Makefile
+++ b/ndb/test/Makefile_old
diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am
new file mode 100644
index 00000000000..16654c50a8d
--- /dev/null
+++ b/ndb/test/ndbapi/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS = flexBench
diff --git a/ndb/test/ndbapi/Makefile b/ndb/test/ndbapi/Makefile_old
index 91f0c84c18e..91f0c84c18e 100644
--- a/ndb/test/ndbapi/Makefile
+++ b/ndb/test/ndbapi/Makefile_old
diff --git a/ndb/test/ndbapi/flexBench/Makefile.am b/ndb/test/ndbapi/flexBench/Makefile.am
new file mode 100644
index 00000000000..3b27499736a
--- /dev/null
+++ b/ndb/test/ndbapi/flexBench/Makefile.am
@@ -0,0 +1,14 @@
+
+bin_PROGRAMS = flexBench
+
+flexBench_SOURCES = flexBench.cpp
+
+LDADD_LOC = $(top_srcdir)/ndb/test/src/libNDBT.a \
+            $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \
+            $(top_srcdir)/ndb/src/mgmapi/libMGM_API.la
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/ndb/test/ndbapi/flexBench/Makefile b/ndb/test/ndbapi/flexBench/Makefile_old
index bfff5cd161a..bfff5cd161a 100644
--- a/ndb/test/ndbapi/flexBench/Makefile
+++ b/ndb/test/ndbapi/flexBench/Makefile_old
diff --git a/ndb/test/run-test/Makefile b/ndb/test/run-test/Makefile_old
index 6b4689b2dbb..6b4689b2dbb 100644
--- a/ndb/test/run-test/Makefile
+++ b/ndb/test/run-test/Makefile_old
diff --git a/ndb/test/src/Makefile.am b/ndb/test/src/Makefile.am
new file mode 100644
index 00000000000..3a9fc7b6de0
--- /dev/null
+++ b/ndb/test/src/Makefile.am
@@ -0,0 +1,18 @@
+
+noinst_LIBRARIES = libNDBT.a
+
+libNDBT_a_SOURCES = \
+	NDBT_ReturnCodes.cpp \
+	NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
+	NDBT_Test.cpp HugoCalculator.cpp \
+	HugoOperations.cpp HugoTransactions.cpp \
+	HugoAsynchTransactions.cpp UtilTransactions.cpp \
+	NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
+	NdbBackup.cpp  NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp
+
+include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
+INCLUDES += -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/ndb/test/src/Makefile b/ndb/test/src/Makefile_old
index 2b634bcd3cd..2b634bcd3cd 100644
--- a/ndb/test/src/Makefile
+++ b/ndb/test/src/Makefile_old
diff --git a/ndb/test/tools/Makefile b/ndb/test/tools/Makefile_old
index b8e90ae207f..b8e90ae207f 100644
--- a/ndb/test/tools/Makefile
+++ b/ndb/test/tools/Makefile_old