diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-16 09:28:17 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-16 09:28:17 +0000 |
| commit | a2b3d71d1f1c866406b691e6b15de275b0d8dceb (patch) | |
| tree | c3bb7d5b187e22fce6e3f5b6dac1be2902a9325b | |
| parent | 3790b5fd6b7b4946c721a23eca855b81262863d6 (diff) | |
| parent | 0babddfd79b8fcc3ffcb2544f12d1114c37145aa (diff) | |
| download | mariadb-git-a2b3d71d1f1c866406b691e6b15de275b0d8dceb.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| -rw-r--r-- | client/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 58398548b75..1c552036f9b 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -20,8 +20,8 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \ $(openssl_includes) LIBS = @CLIENT_LIBS@ -DEPLIB= ../libmysql/libmysqlclient.la \ - @ndb_mgmclient_libs@ +DEPLIB= @ndb_mgmclient_libs@ \ + ../libmysql/libmysqlclient.la LDADD = @CLIENT_EXTRA_LDFLAGS@ $(DEPLIB) bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen |