mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
joreland@mysql.com 2004-05-27 21:05:14 +02:00
commit 44f810340f
7 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ndb/config/type_ndbapi.mk.am
View file

@ -1,3 +1,2 @@
INCLUDES += @NDB_NDBAPI_INCLUDES@
LDADD += $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la

5
ndb/config/type_util.mk.am
View file

@ -1,7 +1,2 @@
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@

2
ndb/src/cw/cpcd/Makefile.am
View file

@ -3,7 +3,7 @@ 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/common/logger/liblogger.la
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

2
ndb/src/kernel/ndb-main/Makefile.am
View file

@ -45,10 +45,10 @@ LDADD += \
$(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/logger/liblogger.la \
$(top_srcdir)/ndb/src/common/util/libgeneral.la
# Don't update the files from bitkeeper

12
ndb/src/mgmclient/Makefile.am
View file

@ -8,16 +8,12 @@ mgmtclient_SOURCES = \
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
LDADD += \
$(top_srcdir)/ndb/src/common/debugger/libtrace.la \
$(top_srcdir)/ndb/src/common/logger/liblogger.la \
$(top_srcdir)/ndb/src/common/util/libgeneral.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/editline/libeditline.a
LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
$(top_srcdir)/ndb/src/common/editline/libeditline.a \
@TERMCAP_LIB@
# Don't update the files from bitkeeper
%::SCCS/s.%

9
ndb/src/mgmsrv/Makefile.am
View file

@ -13,12 +13,11 @@ mgmtsrvr_SOURCES = \
MgmtSrvrConfig.cpp \
CommandInterpreter.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/src/mgmapi
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/src/common/mgmcommon
LDADD_LOC = \
$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
$(top_srcdir)/ndb/src/common/editline/libeditline.a \
@TERMCAP_LIB@
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

5
ndb/test/run-test/Makefile.am
View file

@ -6,11 +6,12 @@ atrt_SOURCES = main.cpp
ndbtest_SCRIPTS = atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
atrt-clear-result.sh make-config.sh
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmclient
LDADD_LOC = $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la $(top_srcdir)/ndb/src/mgmclient/CpcClient.o
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmclient
LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CpcClient.o $(top_srcdir)/ndb/src/libndbclient.la
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%