diff options
| author | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
| commit | 4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d (patch) | |
| tree | 35f1caf73d4e61d1cb7338841a38299682005317 /client/Makefile.am | |
| parent | 7f5be1b65460bea40661bbeefe209831b528c67d (diff) | |
| parent | 6ce9ed784e5507073a33b8c4771fba16f29f840f (diff) | |
| download | mariadb-git-4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d.tar.gz | |
merged
client/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'client/Makefile.am')
| -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 cb69ca5cb3b..f821c796a85 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 |