neww ndb automake

configure.in

@@ -2833,6 +2833,7 @@ 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 \
@@ -2881,12 +2882,21 @@ then
   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/src/Makefile ndb/src/common/Makefile dnl
+   ndb/Makefile ndb/include/Makefile ndb/src/Makefile ndb/src/common/Makefile dnl
-   ndb/src/common/portlib/Makefile dnl
+   ndb/tools/Makefile dnl
-   ndb/src/common/portlib/unix/Makefile dnl
+   ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl
-   ndb/src/common/debugger/Makefile dnl
-   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
@@ -2923,14 +2933,14 @@ then
    ndb/test/Makefile dnl
    ndb/test/src/Makefile dnl
    ndb/test/ndbapi/Makefile dnl
-   ndb/test/ndbapi/flexBench/Makefile dnl
+   ndb/test/ndbapi/bank/Makefile dnl
+   ndb/test/tools/Makefile dnl
+   ndb/test/run-test/Makefile dnl
    ])
-fi
 
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results
-ifdef([NDB_MAKEFILES],,[define(NDB_MAKEFILES, [])])
 AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
  NDB_MAKEFILES dnl
  strings/Makefile regex/Makefile heap/Makefile dnl

ndb/Makefile.am

@@ -1 +1,6 @@
-SUBDIRS = 	src test
+## 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

@@ -1,7 +1,17 @@
 
-INCLUDES =
+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_ndbapitest.mk.am

@@ -1,2 +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/test/Makefile.am

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

ndb/test/ndbapi/Makefile.am

@@ -1,2 +1,79 @@
 
-SUBDIRS = flexBench
+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.%

ndb/test/ndbapi/bank/Bank.cpp

@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "../Bank.hpp"
+#include "Bank.hpp"
 #include <time.h>
 #include <NdbSleep.h>
 #include <UtilTransactions.hpp>

ndb/test/ndbapi/bank/BankLoad.cpp

@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "../Bank.hpp"
+#include "Bank.hpp"
 #include <UtilTransactions.hpp>
 
 /**

ndb/test/ndbapi/bank/Makefile.am

@@ -0,0 +1,22 @@
+
+bin_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
+
+noinst_LIBRARIES = libbank.a
+
+libbank_a_SOURCES = Bank.cpp BankLoad.cpp
+
+testBank_SOURCES = testBank.cpp
+bankSumAccounts_SOURCES = bankSumAccounts.cpp
+bankValidateAllGLs_SOURCES = bankValidateAllGLs.cpp 
+bankMakeGL_SOURCES = bankMakeGL.cpp 
+bankTransactionMaker_SOURCES = bankTransactionMaker.cpp 
+bankCreator_SOURCES = bankCreator.cpp  
+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
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

ndb/test/ndbapi/bank/bankCreator.cpp

@@ -23,7 +23,7 @@
 #include <NDBT.hpp> 
 #include <NdbSleep.h>
 #include <getarg.h>
-#include "../Bank.hpp"
+#include "Bank.hpp"
  
 
 int main(int argc, const char** argv){

ndb/test/ndbapi/bank/bankMakeGL.cpp

@@ -23,7 +23,7 @@
 #include <NDBT.hpp> 
 #include <NdbSleep.h>
 #include <getarg.h>
-#include "../Bank.hpp"
+#include "Bank.hpp"
  
 
 int main(int argc, const char** argv){

ndb/test/ndbapi/bank/bankSumAccounts.cpp

@@ -23,7 +23,7 @@
 #include <NDBT.hpp> 
 #include <NdbSleep.h>
 #include <getarg.h>
-#include "../Bank.hpp"
+#include "Bank.hpp"
  
 
 int main(int argc, const char** argv){

ndb/test/ndbapi/bank/bankTimer.cpp

@@ -24,7 +24,7 @@
 #include <NDBT.hpp> 
 #include <NdbSleep.h>
 #include <getarg.h>
-#include "../Bank.hpp"
+#include "Bank.hpp"
  
 
 int main(int argc, const char** argv){

ndb/test/ndbapi/bank/bankTransactionMaker.cpp

@@ -24,7 +24,7 @@
 #include <NDBT.hpp> 
 #include <NdbSleep.h>
 #include <getarg.h>
-#include "../Bank.hpp"
+#include "Bank.hpp"
  
 
 int main(int argc, const char** argv){

ndb/test/ndbapi/bank/bankValidateAllGLs.cpp

@@ -24,7 +24,7 @@
 #include <NDBT.hpp> 
 #include <NdbSleep.h>
 #include <getarg.h>
-#include "../Bank.hpp"
+#include "Bank.hpp"
  
 
 int main(int argc, const char** argv){

ndb/test/ndbapi/bank/testBank.cpp

@@ -29,7 +29,7 @@
   continue; } 
 
 
-#include "../Bank.hpp"
+#include "Bank.hpp"
 
 int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
   Bank bank;

ndb/test/ndbapi/old_dirs/flexBench/Makefile.am

@@ -3,10 +3,6 @@ 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