diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-15 12:40:32 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-15 12:40:32 +0000 |
| commit | 595d467d0c8052c507894fce843a39fdca3070ce (patch) | |
| tree | ee9f6698fecd6c7653b7fc0f8668138e23025c75 /client/Makefile.am | |
| parent | fe37a1472c22b0a48244b932664925cad68f3e96 (diff) | |
| download | mariadb-git-595d467d0c8052c507894fce843a39fdca3070ce.tar.gz | |
changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
added libs variable for ndbmgmclient used by mysqladmin
add linkage with @ndb_mgmclient_libs@
additional options for ndbcluster
added support for managing the cluster to mysqladmin
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
Makefile.am:
changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first
acinclude.m4:
added libs variable for ndbmgmclient used by mysqladmin
client/Makefile.am:
add linkage with @ndb_mgmclient_libs@
client/client_priv.h:
additional options for ndbcluster
client/mysqladmin.c:
added support for managing the cluster to mysqladmin
configure.in:
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
include/my_global.h:
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index a9da284a753..58398548b75 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -20,7 +20,8 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \ $(openssl_includes) LIBS = @CLIENT_LIBS@ -DEPLIB= ../libmysql/libmysqlclient.la +DEPLIB= ../libmysql/libmysqlclient.la \ + @ndb_mgmclient_libs@ LDADD = @CLIENT_EXTRA_LDFLAGS@ $(DEPLIB) bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen |