From f799dca8d05d1fcca6bd0ee1bd53a25368cab47d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 May 2004 11:09:11 +0000 Subject: 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 --- ndb/test/ndbapi/Makefile | 50 ---------------------------------- ndb/test/ndbapi/Makefile.am | 2 ++ ndb/test/ndbapi/Makefile_old | 50 ++++++++++++++++++++++++++++++++++ ndb/test/ndbapi/flexBench/Makefile | 11 -------- ndb/test/ndbapi/flexBench/Makefile.am | 14 ++++++++++ ndb/test/ndbapi/flexBench/Makefile_old | 11 ++++++++ 6 files changed, 77 insertions(+), 61 deletions(-) delete mode 100644 ndb/test/ndbapi/Makefile create mode 100644 ndb/test/ndbapi/Makefile.am create mode 100644 ndb/test/ndbapi/Makefile_old delete mode 100644 ndb/test/ndbapi/flexBench/Makefile create mode 100644 ndb/test/ndbapi/flexBench/Makefile.am create mode 100644 ndb/test/ndbapi/flexBench/Makefile_old (limited to 'ndb/test/ndbapi') diff --git a/ndb/test/ndbapi/Makefile b/ndb/test/ndbapi/Makefile deleted file mode 100644 index 91f0c84c18e..00000000000 --- a/ndb/test/ndbapi/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -include .defs.mk - - -ifeq ($(NDB_OS), OSE) -DIRS = basic flexBench flexAsynch -else -DIRS = lmc-bench bank ronja -BIN_DIRS = \ - flexAsynch \ - flexBench \ - flexHammer \ - flexScan \ - flexTT \ - create_tab \ - create_all_tabs \ - drop_all_tabs \ - bulk_copy \ - restarter2 restarter \ - restarts testScan testNdbApi \ - testScanInterpreter testIndex \ - testInterpreter \ - testOIBasic \ - testBackup \ - testBasic \ - basicAsynch \ - testNodeRestart \ - testOperations testTransactions \ - testSystemRestart \ - testTimeout \ - testMgm \ - testRestartGci \ - testDataBuffers \ - testDict \ - acid \ - interpreterInTup \ - telco \ - indexTest \ - test_event \ - indexTest2 \ - testGrep - -ifeq ($(NDB_OS), SOLARIS) -ifeq ($(NDB_COMPILER), FORTE6) - DIRS += flexTimedAsynch -endif -endif -endif - -include ${NDB_TOP}/Epilogue.mk - 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_old b/ndb/test/ndbapi/Makefile_old new file mode 100644 index 00000000000..91f0c84c18e --- /dev/null +++ b/ndb/test/ndbapi/Makefile_old @@ -0,0 +1,50 @@ +include .defs.mk + + +ifeq ($(NDB_OS), OSE) +DIRS = basic flexBench flexAsynch +else +DIRS = lmc-bench bank ronja +BIN_DIRS = \ + flexAsynch \ + flexBench \ + flexHammer \ + flexScan \ + flexTT \ + create_tab \ + create_all_tabs \ + drop_all_tabs \ + bulk_copy \ + restarter2 restarter \ + restarts testScan testNdbApi \ + testScanInterpreter testIndex \ + testInterpreter \ + testOIBasic \ + testBackup \ + testBasic \ + basicAsynch \ + testNodeRestart \ + testOperations testTransactions \ + testSystemRestart \ + testTimeout \ + testMgm \ + testRestartGci \ + testDataBuffers \ + testDict \ + acid \ + interpreterInTup \ + telco \ + indexTest \ + test_event \ + indexTest2 \ + testGrep + +ifeq ($(NDB_OS), SOLARIS) +ifeq ($(NDB_COMPILER), FORTE6) + DIRS += flexTimedAsynch +endif +endif +endif + +include ${NDB_TOP}/Epilogue.mk + diff --git a/ndb/test/ndbapi/flexBench/Makefile b/ndb/test/ndbapi/flexBench/Makefile deleted file mode 100644 index bfff5cd161a..00000000000 --- a/ndb/test/ndbapi/flexBench/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -include .defs.mk - -TYPE := ndbapitest - -BIN_TARGET := flexBench - -# Source files of non-templated classes (.C files) -SOURCES = flexBench.cpp - -include $(NDB_TOP)/Epilogue.mk - 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_old b/ndb/test/ndbapi/flexBench/Makefile_old new file mode 100644 index 00000000000..bfff5cd161a --- /dev/null +++ b/ndb/test/ndbapi/flexBench/Makefile_old @@ -0,0 +1,11 @@ +include .defs.mk + +TYPE := ndbapitest + +BIN_TARGET := flexBench + +# Source files of non-templated classes (.C files) +SOURCES = flexBench.cpp + +include $(NDB_TOP)/Epilogue.mk + -- cgit v1.2.1