From 90dabc71595b9f7e76434260aa511c5e3bb285c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Jun 2004 00:54:58 +0000 Subject: several ndb make changes, see respective file ndb/src/kernel/Main.cpp: Rename: ndb/src/kernel/ndb-main/Main.cpp -> ndb/src/kernel/Main.cpp ndb/src/kernel/SimBlockList.cpp: Rename: ndb/src/kernel/ndb-main/SimBlockList.cpp -> ndb/src/kernel/SimBlockList.cpp BitKeeper/deleted/.del-Makefile.am~dbb6038d7163a54d: Delete: ndb/src/kernel/ndb-main/Makefile.am BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0: Delete: ndb/src/kernel/ndb-main/Makefile_old ndb/old_files/BinDist.sh: Rename: ndb/BinDist.sh -> ndb/old_files/BinDist.sh ndb/old_files/Defs.mk: Rename: ndb/Defs.mk -> ndb/old_files/Defs.mk ndb/old_files/Makefile: Rename: ndb/Makefile_old -> ndb/old_files/Makefile ndb/old_files/SrcDist.sh: Rename: ndb/SrcDist.sh -> ndb/old_files/SrcDist.sh ndb/old_files/configure: Rename: ndb/configure_old -> ndb/old_files/configure ndb/old_files/Epilogue.mk: Rename: ndb/Epilogue.mk_old -> ndb/old_files/Epilogue.mk ndb/config/old_files/Defs.DEBUG.mk: Rename: ndb/config/Defs.DEBUG.mk -> ndb/config/old_files/Defs.DEBUG.mk ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk: Rename: ndb/config/Defs.HPUX.HPPA.GCC.mk -> ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk: Rename: ndb/config/Defs.IBMAIX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk ndb/config/old_files/Defs.LINUX.x86.GCC.mk: Rename: ndb/config/Defs.LINUX.x86.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86.GCC.mk ndb/config/old_files/Defs.LINUX.x86.ICC.mk: Rename: ndb/config/Defs.LINUX.x86.ICC.mk -> ndb/config/old_files/Defs.LINUX.x86.ICC.mk ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk: Rename: ndb/config/Defs.LINUX.x86_64.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk: Rename: ndb/config/Defs.MACOSX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk: Rename: ndb/config/Defs.OSE.PPC750.DIAB.mk -> ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk ndb/config/old_files/Defs.RELEASE.mk: Rename: ndb/config/Defs.RELEASE.mk -> ndb/config/old_files/Defs.RELEASE.mk ndb/config/old_files/Defs.RELEASE_TRACE.mk: Rename: ndb/config/Defs.RELEASE_TRACE.mk -> ndb/config/old_files/Defs.RELEASE_TRACE.mk ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk: Rename: ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk -> ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk: Rename: ndb/config/Defs.SOFTOSE.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk: Rename: ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk: Rename: ndb/config/Defs.SOLARIS.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk: Rename: ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk: Rename: ndb/config/Defs.SOLARIS6.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk: Rename: ndb/config/Defs.TRU64X.ALPHA.GCC.mk -> ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk ndb/config/old_files/Defs.WIN32.x86.VC7.mk: Rename: ndb/config/Defs.WIN32.x86.VC7.mk -> ndb/config/old_files/Defs.WIN32.x86.VC7.mk ndb/config/old_files/acinclude.m4: Rename: ndb/config/acinclude.m4 -> ndb/config/old_files/acinclude.m4 ndb/config/old_files/Makefile.am: Rename: ndb/config/Makefile.am_old -> ndb/config/old_files/Makefile.am ndb/config/old_files/GuessConfig.sh: Rename: ndb/config/GuessConfig.sh_old -> ndb/config/old_files/GuessConfig.sh ndb/config/old_files/configure.in: Rename: ndb/config/configure.in -> ndb/config/old_files/configure.in ndb/config/old_files/config.h.in: Rename: ndb/config/config.h.in -> ndb/config/old_files/config.h.in ndb/old_files/README: Rename: ndb/README -> ndb/old_files/README ndb/old_files/mysqlclusterenv.sh: Rename: ndb/mysqlclusterenv.sh -> ndb/old_files/mysqlclusterenv.sh ndb/old_files/env.sh: Rename: ndb/env.sh -> ndb/old_files/env.sh BitKeeper/deleted/.del-Makefile~650473b0dabb331b: Delete: ndb/src/scripts/Makefile ndb/src/old_files/ndbbaseclient/Makefile: mvdir ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp: mvdir ndb/src/old_files/ndbclient/Makefile: mvdir ndb/src/old_files/ndbclient/ndbclient_dummy.cpp: mvdir ndb/src/old_files/Makefile: Rename: ndb/src/Makefile_old -> ndb/src/old_files/Makefile acinclude.m4: added ndb configure options configure.in: moved lots of stuff for ndb over to Makefile.ams and added some config opt for ndb mysql-test/ndb/install_ndbcluster.sh: adopt to new ndb install mysql-test/ndb/stop_ndbcluster.sh: adopt to new ndb install ndb/Makefile.am: moved some things to include/Makefile.am ndb/config/common.mk.am: moved some things from configure.in ndb/config/type_kernel.mk.am: moved some things from configure.in ndb/config/type_mgmapiclient.mk.am: moved some things from configure.in ndb/config/type_ndbapi.mk.am: moved some things from configure.in ndb/config/type_ndbapiclient.mk.am: moved some things from configure.in ndb/config/type_ndbapitest.mk.am: moved some things from configure.in ndb/config/type_ndbapitools.mk.am: moved some things from configure.in ndb/config/type_util.mk.am: moved some things from configure.in ndb/src/Makefile.am: . ndb/src/common/portlib/Makefile.am: fix for make distdir ndb/src/cw/cpcd/Makefile.am: added configurable ldflags ndb/src/kernel/Makefile.am: moved up ndb-main one level ndb/src/kernel/blocks/backup/restore/Makefile.am: added configurable ldflags ndb/src/kernel/blocks/suma/Makefile.am: fixed error ndb/src/kernel/error/Makefile.am: fix error ndb/src/kernel/vm/Makefile.am: fix error ndb/src/mgmapi/Makefile.am: removed libMGM_API ndb/src/mgmclient/Makefile.am: added configurable ldflags ndb/src/mgmsrv/Makefile.am: added configurable ldflags ndb/src/ndbapi/Makefile.am: removed libNDB_API ndb/test/Makefile.am: added optional build of ndbapi tests ndb/tools/Makefile.am: added configurable ldflags ndb/include/Makefile.am: fixed missing .h files in make distdir scripts/make_binary_distribution.sh: updated for ndb and new make --- ndb/src/old_files/Makefile | 33 +++++++++++++++++++ ndb/src/old_files/ndbbaseclient/Makefile | 29 +++++++++++++++++ .../ndbbaseclient/ndbbaseclient_dummy.cpp | 0 ndb/src/old_files/ndbclient/Makefile | 37 ++++++++++++++++++++++ ndb/src/old_files/ndbclient/ndbclient_dummy.cpp | 0 5 files changed, 99 insertions(+) create mode 100644 ndb/src/old_files/Makefile create mode 100644 ndb/src/old_files/ndbbaseclient/Makefile create mode 100644 ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp create mode 100644 ndb/src/old_files/ndbclient/Makefile create mode 100644 ndb/src/old_files/ndbclient/ndbclient_dummy.cpp (limited to 'ndb/src/old_files') diff --git a/ndb/src/old_files/Makefile b/ndb/src/old_files/Makefile new file mode 100644 index 00000000000..cd33563ddc1 --- /dev/null +++ b/ndb/src/old_files/Makefile @@ -0,0 +1,33 @@ +include .defs.mk + +DIRS := \ + client \ + common \ + kernel \ + ndbapi \ + mgmsrv \ + mgmapi \ + newtonapi \ + rep \ + mgmclient \ + cw \ + ndbbaseclient +ifneq ($(NDB_ODBC),N) + DIRS += ndbclient +endif +ifeq ($(findstring OSE, $(NDB_OS)),) + DIRS += scripts +endif +include $(NDB_TOP)/Epilogue.mk + +_bins_mgmsrv: _libs_ndbapi +_bins_mgmsrv: _libs_mgmapi +_bins_mgmclient: _libs_mgmapi +_bins_mgmclient: _libs_common +_bins_client: _bins_ndbapi +_bins_common: _bins_mgmapi +_bins_kernel: _bins_ndbapi +_bins_newtonapi: _bins_ndbapi +_bins_mgmapi : _libs_common +_bins_rep: _libs_common +_bins_rep: _libs_ndbapi diff --git a/ndb/src/old_files/ndbbaseclient/Makefile b/ndb/src/old_files/ndbbaseclient/Makefile new file mode 100644 index 00000000000..f4c49a95ffa --- /dev/null +++ b/ndb/src/old_files/ndbbaseclient/Makefile @@ -0,0 +1,29 @@ +include .defs.mk + +TYPE := * + +PIC_ARCHIVE := Y +NONPIC_ARCHIVE := Y +ARCHIVE_TARGET := ndbbaseclient + +A_LIB := Y +SO_LIB := Y +PIC_LIB := Y +LIB_TARGET := ndbclient + +LIB_TARGET_ARCHIVES := $(ARCHIVE_TARGET) \ + ndbapi \ + mgmapi \ + newtonapi \ + transporter \ + general \ + signaldataprint \ + mgmsrvcommon \ + portlib \ + logger \ + trace + +SOURCES = ndbbaseclient_dummy.cpp + +include $(NDB_TOP)/Epilogue.mk + diff --git a/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp b/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ndb/src/old_files/ndbclient/Makefile b/ndb/src/old_files/ndbclient/Makefile new file mode 100644 index 00000000000..2c597eccfa1 --- /dev/null +++ b/ndb/src/old_files/ndbclient/Makefile @@ -0,0 +1,37 @@ +include .defs.mk + +TYPE := * + +PIC_ARCHIVE := Y +NONPIC_ARCHIVE := Y +ARCHIVE_TARGET := ndbclient + +A_LIB := N +SO_LIB := Y +PIC_LIB := Y +LIB_TARGET := ndbclient_extra + +LDFLAGS_LAST = -lstdc++ -lm + +LIB_TARGET_ARCHIVES := $(ARCHIVE_TARGET) \ + ndbapi \ + mgmapi \ + newtonapi \ + transporter \ + general \ + signaldataprint \ + mgmsrvcommon \ + portlib \ + logger \ + trace \ + odbcdriver \ + odbchandles \ + odbcdictionary \ + odbccodegen \ + odbcexecutor \ + odbccommon + +SOURCES = ndbclient_dummy.cpp + +include $(NDB_TOP)/Epilogue.mk + diff --git a/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp b/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.1