diff options
| author | unknown <joreland@mysql.com> | 2004-11-22 08:20:34 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-22 08:20:34 +0100 |
| commit | 366ef4faebf354e28afbcf104635a1400e99cbeb (patch) | |
| tree | e62aff8c238f4510f2e229834c2f6871bad7f480 /client/Makefile.am | |
| parent | 5a022e7ba99ea492da74a95907574d852deda514 (diff) | |
| parent | 5a7198f54d1a11ac7ef70a55c6a9b9044147df54 (diff) | |
| download | mariadb-git-366ef4faebf354e28afbcf104635a1400e99cbeb.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl2077
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index f59395ae026..0b261b1b105 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -20,8 +20,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \ $(openssl_includes) LIBS = @CLIENT_LIBS@ -DEPLIB= @ndb_mgmclient_libs@ \ - ../libmysql/libmysqlclient.la +DEPLIB= ../libmysql/libmysqlclient.la LDADD = @CLIENT_EXTRA_LDFLAGS@ $(DEPLIB) bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen |