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/config | |
| 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/config')
| -rw-r--r-- | ndb/config/type_ndbapitest.mk.am | 1 | ||||
| -rw-r--r-- | ndb/config/type_ndbapitools.mk.am | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am index 02288d06c2c..8aa92ceb6a7 100644 --- a/ndb/config/type_ndbapitest.mk.am +++ b/ndb/config/type_ndbapitest.mk.am @@ -1,4 +1,5 @@ +AM_LDFLAGS = -rpath @ndblibdir@ LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \ $(top_srcdir)/ndb/src/libndbclient.la diff --git a/ndb/config/type_ndbapitools.mk.am b/ndb/config/type_ndbapitools.mk.am new file mode 100644 index 00000000000..ac302ae9eb4 --- /dev/null +++ b/ndb/config/type_ndbapitools.mk.am @@ -0,0 +1,5 @@ + +LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \ + $(top_srcdir)/ndb/src/.libs/libndbclient.a + +INCLUDES += @NDB_NDBAPITEST_INCLUDES@ |