diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-06-01 11:19:40 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-06-01 11:19:40 +0000 |
| commit | 0bfc8c57ca2f3c5e8f56e12604eb94e1dc47ec9f (patch) | |
| tree | 21e5f7f65f51e47ab501506e005b1143f8d08f33 /ndb/src | |
| parent | 36652d00535c340fe33a8b170b8317204402e876 (diff) | |
| download | mariadb-git-0bfc8c57ca2f3c5e8f56e12604eb94e1dc47ec9f.tar.gz | |
various ndb make changes, see respective file
BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066:
Delete: ndb/include/Makefile.am
acinclude.m4:
static linking of ndbclient into mysqld
configure.in:
removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci
ndb/Makefile.am:
dist-hook for make distdir in ndb
ndb/config/type_ndbapitest.mk.am:
use of libndbclient.so in testprograms
ndb/config/type_ndbapitools.mk.am:
static linking to binary distributed ndb tools
ndb/src/Makefile.am:
enable libndbclient.so
ndb/src/common/transporter/Makefile.am:
added support for optional inclusion of shared mem and sci in ndb transporter
ndb/tools/Makefile.am:
new type for tools which should be statically linked with libndbclient
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'ndb/src')
| -rw-r--r-- | ndb/src/Makefile.am | 2 | ||||
| -rw-r--r-- | ndb/src/common/transporter/Makefile.am | 20 |
2 files changed, 6 insertions, 16 deletions
diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am index 2999c617a06..08c5624038f 100644 --- a/ndb/src/Makefile.am +++ b/ndb/src/Makefile.am @@ -14,3 +14,5 @@ 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/transporter/Makefile.am b/ndb/src/common/transporter/Makefile.am index 36411b99661..218b261606d 100644 --- a/ndb/src/common/transporter/Makefile.am +++ b/ndb/src/common/transporter/Makefile.am @@ -1,8 +1,6 @@ noinst_LTLIBRARIES = libtransporter.la -#libtransporter_la_SOURCES = @NDB_TRANSPORTER_SOURCES@ - libtransporter_la_SOURCES = \ Transporter.cpp \ SendBuffer.cpp \ @@ -10,20 +8,10 @@ libtransporter_la_SOURCES = \ TransporterRegistry.cpp \ Packer.cpp -#libtransporter_la_SOURCES = \ -# Transporter.cpp \ -# SendBuffer.cpp \ -# TCP_Transporter.cpp \ -# TransporterRegistry.cpp \ -# Packer.cpp -# -#if HAVE_NDB_SHM -# libtransporter_la_SOURCES += SHM_Transporter.cpp SHM_Transporter.unix.cpp -#endif -# -#if HAVE_NDB_SCI -# libtransporter_la_SOURCES += SCI_Transporter.cpp -#endif +EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp + +libtransporter_la_LIBADD = @ndb_transporter_opt_objs@ +libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@ INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter |