diff options
Diffstat (limited to 'ndb/src')
22 files changed, 89 insertions, 142 deletions
diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am index 08c5624038f..69eb4f53d7f 100644 --- a/ndb/src/Makefile.am +++ b/ndb/src/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = common mgmapi ndbapi . kernel mgmsrv mgmclient cw +include $(top_srcdir)/ndb/config/common.mk.am + ndblib_LTLIBRARIES = libndbclient.la libndbclient_la_SOURCES = @@ -14,5 +16,3 @@ libndbclient_la_LIBADD = \ $(top_srcdir)/ndb/src/common/logger/liblogger.la \ $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \ $(top_srcdir)/ndb/src/common/util/libgeneral.la - -AM_LDFLAGS = -rpath @ndblibdir@ diff --git a/ndb/src/common/portlib/Makefile.am b/ndb/src/common/portlib/Makefile.am index 2b1c9eb5ac0..485195fd037 100644 --- a/ndb/src/common/portlib/Makefile.am +++ b/ndb/src/common/portlib/Makefile.am @@ -1 +1,3 @@ -SUBDIRS = unix +SUBDIRS = unix + +noinst_DATA = gcc.cpp diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am index 8d5a8d63e73..090f115301d 100644 --- a/ndb/src/cw/cpcd/Makefile.am +++ b/ndb/src/cw/cpcd/Makefile.am @@ -3,10 +3,12 @@ ndbtools_PROGRAMS = ndb_cpcd ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp -LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a +LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am +AM_LDFLAGS = @ndb_bin_am_ldflags@ + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/ndb/src/kernel/ndb-main/Main.cpp b/ndb/src/kernel/Main.cpp index 961d111f298..961d111f298 100644 --- a/ndb/src/kernel/ndb-main/Main.cpp +++ b/ndb/src/kernel/Main.cpp diff --git a/ndb/src/kernel/Makefile.am b/ndb/src/kernel/Makefile.am index 1e52a561964..bc84eda1f92 100644 --- a/ndb/src/kernel/Makefile.am +++ b/ndb/src/kernel/Makefile.am @@ -1 +1,58 @@ -SUBDIRS = error blocks vm ndb-main +SUBDIRS = error blocks vm + +include $(top_srcdir)/ndb/config/common.mk.am + +ndbbin_PROGRAMS = ndb + +ndb_SOURCES = Main.cpp SimBlockList.cpp + +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +INCLUDES += \ + -Iblocks/cmvmi \ + -Iblocks/dbacc \ + -Iblocks/dbdict \ + -Iblocks/dbdih \ + -Iblocks/dblqh \ + -Iblocks/dbtc \ + -Iblocks/dbtup \ + -Iblocks/ndbfs \ + -Iblocks/ndbcntr \ + -Iblocks/qmgr \ + -Iblocks/trix \ + -Iblocks/backup \ + -Iblocks/dbutil \ + -Iblocks/suma \ + -Iblocks/grep \ + -Iblocks/dbtux + +LDADD += \ + 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/logger/liblogger.la \ + $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ + $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \ + $(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/kernel/ndb-main/SimBlockList.cpp b/ndb/src/kernel/SimBlockList.cpp index bc6262e0723..bc6262e0723 100644 --- a/ndb/src/kernel/ndb-main/SimBlockList.cpp +++ b/ndb/src/kernel/SimBlockList.cpp diff --git a/ndb/src/kernel/blocks/backup/restore/Makefile.am b/ndb/src/kernel/blocks/backup/restore/Makefile.am index cf90587eda8..6d928a11cc1 100644 --- a/ndb/src/kernel/blocks/backup/restore/Makefile.am +++ b/ndb/src/kernel/blocks/backup/restore/Makefile.am @@ -8,3 +8,5 @@ LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.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 + +AM_LDFLAGS = @ndb_bin_am_ldflags@ diff --git a/ndb/src/kernel/blocks/suma/Makefile.am b/ndb/src/kernel/blocks/suma/Makefile.am index 5fc59083484..4dacb22af51 100644 --- a/ndb/src/kernel/blocks/suma/Makefile.am +++ b/ndb/src/kernel/blocks/suma/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LIBRARIES = libsuma.a +noinst_LIBRARIES = libsuma.a libsuma_a_SOURCES = Suma.cpp SumaInit.cpp diff --git a/ndb/src/kernel/error/Makefile.am b/ndb/src/kernel/error/Makefile.am index 5ddf050caaa..4514d2d105c 100644 --- a/ndb/src/kernel/error/Makefile.am +++ b/ndb/src/kernel/error/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LIBRARIES = liberror.a +noinst_LIBRARIES = liberror.a liberror_a_SOURCES = TimeModule.cpp \ ErrorReporter.cpp \ diff --git a/ndb/src/kernel/ndb-main/Makefile.am b/ndb/src/kernel/ndb-main/Makefile.am deleted file mode 100644 index b41c6e948ea..00000000000 --- a/ndb/src/kernel/ndb-main/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ - -ndbbindir_root = $(prefix) -ndbbindir = $(ndbbindir_root)/ndb/bin -ndbbin_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 += \ - ../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/.libs/libtransporter.a \ - $(top_srcdir)/ndb/src/common/debugger/.libs/libtrace.a \ - $(top_srcdir)/ndb/src/common/debugger/signaldata/.libs/libsignaldataprint.a \ - $(top_srcdir)/ndb/src/common/logger/.libs/liblogger.a \ - $(top_srcdir)/ndb/src/common/mgmcommon/.libs/libmgmsrvcommon.a \ - $(top_srcdir)/ndb/src/mgmapi/.libs/libmgmapi.a \ - $(top_srcdir)/ndb/src/common/portlib/unix/.libs/libportlib.a \ - $(top_srcdir)/ndb/src/common/util/.libs/libgeneral.a - -# Don't update the files from bitkeeper -%::SCCS/s.% diff --git a/ndb/src/kernel/ndb-main/Makefile_old b/ndb/src/kernel/ndb-main/Makefile_old deleted file mode 100644 index 08fc125cb00..00000000000 --- a/ndb/src/kernel/ndb-main/Makefile_old +++ /dev/null @@ -1,42 +0,0 @@ -include .defs.mk - -TYPE := kernel - -BIN_TARGET := ndb -BIN_TARGET_ARCHIVES := mgmapi \ - cmvmi dbacc dbdict dbdih dblqh dbtc \ - dbtup ndbfs ndbcntr qmgr trix backup dbutil suma grep dbtux \ - transporter \ - kernel \ - error \ - trace \ - signaldataprint \ - mgmsrvcommon mgmapi \ - portlib \ - logger \ - general - -# Source files of non-templated classes (.cpp files) -SOURCES = \ - Main.cpp \ - SimBlockList.cpp - -CCFLAGS_LOC = -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/cmvmi) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbacc) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbdict) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbdih) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dblqh) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbtc) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbtup) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/ndbfs) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/missra) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/ndbcntr) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/qmgr) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/trix) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/backup) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbutil) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/suma) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/grep) \ - -I$(call fixpath,$(NDB_TOP)/src/kernel/blocks/dbtux) - -include $(NDB_TOP)/Epilogue.mk diff --git a/ndb/src/kernel/vm/Makefile.am b/ndb/src/kernel/vm/Makefile.am index c26e6483eca..4e9dbe36c78 100644 --- a/ndb/src/kernel/vm/Makefile.am +++ b/ndb/src/kernel/vm/Makefile.am @@ -3,7 +3,7 @@ #DIRS += testLongSig #endif -pkglib_LIBRARIES = libkernel.a +noinst_LIBRARIES = libkernel.a libkernel_a_SOURCES = \ SimulatedBlock.cpp \ diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am index e67d88b3841..e4fa1d449c6 100644 --- a/ndb/src/mgmapi/Makefile.am +++ b/ndb/src/mgmapi/Makefile.am @@ -1,10 +1,7 @@ -noinst_LTLIBRARIES = libmgmapi.la libMGM_API.la +noinst_LTLIBRARIES = libmgmapi.la -libmgmapi_la_SOURCES_loc = mgmapi.cpp mgmapi_configuration.cpp - -libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc) -libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc) +libmgmapi_la_SOURCES = mgmapi.cpp mgmapi_configuration.cpp INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon DEFS_LOC = -DNO_DEBUG_MESSAGES @@ -12,9 +9,5 @@ DEFS_LOC = -DNO_DEBUG_MESSAGES include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am -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/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am index 56c7c050558..65a194e75b3 100644 --- a/ndb/src/mgmclient/Makefile.am +++ b/ndb/src/mgmclient/Makefile.am @@ -1,5 +1,5 @@ -ndbbin_PROGRAMS = mgmtclient +ndbtools_PROGRAMS = mgmtclient mgmtclient_SOURCES = \ main.cpp \ @@ -11,9 +11,11 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon -LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a \ +LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \ $(top_srcdir)/ndb/src/common/editline/libeditline.a \ @TERMCAP_LIB@ +AM_LDFLAGS = @ndb_bin_am_ldflags@ + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am index 56e8b2ee628..3c7e289251c 100644 --- a/ndb/src/mgmsrv/Makefile.am +++ b/ndb/src/mgmsrv/Makefile.am @@ -17,12 +17,14 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \ -I$(top_srcdir)/ndb/src/mgmapi \ -I$(top_srcdir)/ndb/src/common/mgmcommon -LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a \ +LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \ $(top_srcdir)/ndb/src/common/editline/libeditline.a \ @TERMCAP_LIB@ include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +AM_LDFLAGS = @ndb_bin_am_ldflags@ + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/ndb/src/ndbapi/Makefile.am b/ndb/src/ndbapi/Makefile.am index c4a80fb86ef..9e2c97db3b5 100644 --- a/ndb/src/ndbapi/Makefile.am +++ b/ndb/src/ndbapi/Makefile.am @@ -1,12 +1,13 @@ #SUBDIRS = signal-sender -noinst_LTLIBRARIES = libndbapi.la libNDB_API.la +noinst_LTLIBRARIES = libndbapi.la -libndbapi_la_SOURCES_loc = \ +libndbapi_la_SOURCES = \ TransporterFacade.cpp \ ClusterMgr.cpp \ Ndb.cpp \ - NdbPoolImpl.cpp NdbPool.cpp \ + NdbPoolImpl.cpp \ + NdbPool.cpp \ Ndblist.cpp \ Ndbif.cpp \ Ndbinit.cpp \ @@ -23,7 +24,8 @@ libndbapi_la_SOURCES_loc = \ NdbOperationExec.cpp \ NdbResultSet.cpp \ NdbCursorOperation.cpp \ - NdbScanReceiver.cpp NdbScanOperation.cpp NdbScanFilter.cpp \ + NdbScanReceiver.cpp NdbScanOperation.cpp \ + NdbScanFilter.cpp \ NdbIndexOperation.cpp \ NdbEventOperation.cpp \ NdbEventOperationImpl.cpp \ @@ -33,25 +35,14 @@ libndbapi_la_SOURCES_loc = \ 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) + NdbDictionary.cpp \ + NdbDictionaryImpl.cpp \ + DictCache.cpp INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi 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/mgmapi/libMGM_API.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/Makefile_old b/ndb/src/old_files/Makefile index cd33563ddc1..cd33563ddc1 100644 --- a/ndb/src/Makefile_old +++ b/ndb/src/old_files/Makefile diff --git a/ndb/src/ndbbaseclient/Makefile b/ndb/src/old_files/ndbbaseclient/Makefile index f4c49a95ffa..f4c49a95ffa 100644 --- a/ndb/src/ndbbaseclient/Makefile +++ b/ndb/src/old_files/ndbbaseclient/Makefile diff --git a/ndb/src/ndbbaseclient/ndbbaseclient_dummy.cpp b/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp index e69de29bb2d..e69de29bb2d 100644 --- a/ndb/src/ndbbaseclient/ndbbaseclient_dummy.cpp +++ b/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp diff --git a/ndb/src/ndbclient/Makefile b/ndb/src/old_files/ndbclient/Makefile index 2c597eccfa1..2c597eccfa1 100644 --- a/ndb/src/ndbclient/Makefile +++ b/ndb/src/old_files/ndbclient/Makefile diff --git a/ndb/src/ndbclient/ndbclient_dummy.cpp b/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp index e69de29bb2d..e69de29bb2d 100644 --- a/ndb/src/ndbclient/ndbclient_dummy.cpp +++ b/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp diff --git a/ndb/src/scripts/Makefile b/ndb/src/scripts/Makefile deleted file mode 100644 index bc8049ac34b..00000000000 --- a/ndb/src/scripts/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -include .defs.mk - -DIRS := - -include $(NDB_TOP)/Epilogue.mk |