Intermediary commit: Removed some old Makefiles and introduces Makefile.am

ndb/src/Makefile_old:
  Rename: ndb/src/Makefile -> ndb/src/Makefile_old
ndb/src/common/Makefile_old:
  Rename: ndb/src/common/Makefile -> ndb/src/common/Makefile_old
ndb/src/common/portlib/Makefile_old:
  Rename: ndb/src/common/portlib/Makefile -> ndb/src/common/portlib/Makefile_old
ndb/src/common/portlib/unix/Makefile_old:
  Rename: ndb/src/common/portlib/unix/Makefile -> ndb/src/common/portlib/unix/Makefile_old
ndb/src/common/debugger/Makefile_old:
  Rename: ndb/src/common/debugger/Makefile -> ndb/src/common/debugger/Makefile_old
ndb/src/common/logger/Makefile_old:
  Rename: ndb/src/common/logger/Makefile -> ndb/src/common/logger/Makefile_old
ndb/src/common/util/Makefile_old:
  Rename: ndb/src/common/util/Makefile -> ndb/src/common/util/Makefile_old
ndb/src/common/mgmcommon/Makefile_old:
  Rename: ndb/src/common/mgmcommon/Makefile -> ndb/src/common/mgmcommon/Makefile_old
ndb/src/common/transporter/Makefile_old:
  Rename: ndb/src/common/transporter/Makefile -> ndb/src/common/transporter/Makefile_old
ndb/src/kernel/Makefile_old:
  Rename: ndb/src/kernel/Makefile -> ndb/src/kernel/Makefile_old
ndb/src/kernel/error/Makefile_old:
  Rename: ndb/src/kernel/error/Makefile -> ndb/src/kernel/error/Makefile_old
ndb/src/kernel/blocks/Makefile_old:
  Rename: ndb/src/kernel/blocks/Makefile -> ndb/src/kernel/blocks/Makefile_old
ndb/src/kernel/blocks/cmvmi/Makefile_old:
  Rename: ndb/src/kernel/blocks/cmvmi/Makefile -> ndb/src/kernel/blocks/cmvmi/Makefile_old
ndb/src/kernel/blocks/dbacc/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbacc/Makefile -> ndb/src/kernel/blocks/dbacc/Makefile_old
ndb/src/kernel/blocks/dbdict/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbdict/Makefile -> ndb/src/kernel/blocks/dbdict/Makefile_old
ndb/src/kernel/blocks/dbdih/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbdih/Makefile -> ndb/src/kernel/blocks/dbdih/Makefile_old
ndb/src/kernel/blocks/dblqh/Makefile_old:
  Rename: ndb/src/kernel/blocks/dblqh/Makefile -> ndb/src/kernel/blocks/dblqh/Makefile_old
ndb/src/kernel/blocks/dbtc/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbtc/Makefile -> ndb/src/kernel/blocks/dbtc/Makefile_old
ndb/src/kernel/blocks/dbtup/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbtup/Makefile -> ndb/src/kernel/blocks/dbtup/Makefile_old
ndb/src/kernel/blocks/ndbfs/Makefile_old:
  Rename: ndb/src/kernel/blocks/ndbfs/Makefile -> ndb/src/kernel/blocks/ndbfs/Makefile_old
ndb/src/kernel/blocks/ndbcntr/Makefile_old:
  Rename: ndb/src/kernel/blocks/ndbcntr/Makefile -> ndb/src/kernel/blocks/ndbcntr/Makefile_old
ndb/src/kernel/blocks/qmgr/Makefile_old:
  Rename: ndb/src/kernel/blocks/qmgr/Makefile -> ndb/src/kernel/blocks/qmgr/Makefile_old
ndb/src/kernel/blocks/trix/Makefile_old:
  Rename: ndb/src/kernel/blocks/trix/Makefile -> ndb/src/kernel/blocks/trix/Makefile_old
ndb/src/kernel/blocks/backup/Makefile_old:
  Rename: ndb/src/kernel/blocks/backup/Makefile -> ndb/src/kernel/blocks/backup/Makefile_old
ndb/src/kernel/blocks/dbutil/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbutil/Makefile -> ndb/src/kernel/blocks/dbutil/Makefile_old
ndb/src/kernel/blocks/suma/Makefile_old:
  Rename: ndb/src/kernel/blocks/suma/Makefile -> ndb/src/kernel/blocks/suma/Makefile_old
ndb/src/kernel/blocks/grep/Makefile_old:
  Rename: ndb/src/kernel/blocks/grep/Makefile -> ndb/src/kernel/blocks/grep/Makefile_old
ndb/src/kernel/blocks/dbtux/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbtux/Makefile -> ndb/src/kernel/blocks/dbtux/Makefile_old
ndb/src/kernel/vm/Makefile_old:
  Rename: ndb/src/kernel/vm/Makefile -> ndb/src/kernel/vm/Makefile_old
ndb/src/kernel/ndb-main/Makefile_old:
  Rename: ndb/src/kernel/ndb-main/Makefile -> ndb/src/kernel/ndb-main/Makefile_old
ndb/src/ndbapi/Makefile_old:
  Rename: ndb/src/ndbapi/Makefile -> ndb/src/ndbapi/Makefile_old
ndb/src/common/debugger/signaldata/Makefile_old:
  Rename: ndb/src/common/debugger/signaldata/Makefile -> ndb/src/common/debugger/signaldata/Makefile_old
ndb/src/mgmapi/Makefile_old:
  Rename: ndb/src/mgmapi/Makefile -> ndb/src/mgmapi/Makefile_old
ndb/src/mgmsrv/Makefile_old:
  Rename: ndb/src/mgmsrv/Makefile -> ndb/src/mgmsrv/Makefile_old
ndb/src/mgmclient/Makefile_old:
  Rename: ndb/src/mgmclient/Makefile -> ndb/src/mgmclient/Makefile_old
ndb/Makefile_old:
  Rename: ndb/Makefile -> ndb/Makefile_old
ndb/src/cw/Makefile_old:
  Rename: ndb/src/cw/Makefile -> ndb/src/cw/Makefile_old
ndb/src/cw/cpcd/Makefile_old:
  Rename: ndb/src/cw/cpcd/Makefile -> ndb/src/cw/cpcd/Makefile_old
ndb/test/Makefile_old:
  Rename: ndb/test/Makefile -> ndb/test/Makefile_old
ndb/test/src/Makefile_old:
  Rename: ndb/test/src/Makefile -> ndb/test/src/Makefile_old
ndb/src/common/editline/Makefile_old:
  Rename: ndb/src/common/editline/Makefile -> ndb/src/common/editline/Makefile_old
ndb/configure_old:
  Rename: ndb/configure -> ndb/configure_old
ndb/test/tools/Makefile_old:
  Rename: ndb/test/tools/Makefile -> ndb/test/tools/Makefile_old
ndb/test/run-test/Makefile_old:
  Rename: ndb/test/run-test/Makefile -> ndb/test/run-test/Makefile_old
ndb/Epilogue.mk_old:
  Rename: ndb/Epilogue.mk -> ndb/Epilogue.mk_old
ndb/src/kernel/blocks/backup/restore/Makefile_old:
  Rename: ndb/src/kernel/blocks/backup/restore/Makefile -> ndb/src/kernel/blocks/backup/restore/Makefile_old
ndb/config/Makefile.am_old:
  Rename: ndb/config/Makefile.am -> ndb/config/Makefile.am_old
ndb/config/GuessConfig.sh_old:
  Rename: ndb/config/GuessConfig.sh -> ndb/config/GuessConfig.sh_old
ndb/test/ndbapi/Makefile_old:
  Rename: ndb/test/ndbapi/Makefile.am -> ndb/test/ndbapi/Makefile_old
ndb/test/ndbapi/flexBench/Makefile_old:
  Rename: ndb/test/ndbapi/flexBench/Makefile.am -> ndb/test/ndbapi/flexBench/Makefile_old

9 files changed, 24 insertions, 0 deletions

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@