diff options
| author | msvensson@neptunus.(none) <> | 2006-02-20 13:04:40 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-02-20 13:04:40 +0100 |
| commit | 4cde1d1259e5670f6673053c798aed52eab9879a (patch) | |
| tree | d53a4ab6801681257319eee2d03f2b5975955ee1 /client/Makefile.am | |
| parent | ddc2da9c093ead99076138bebfeae4a78a5fcb56 (diff) | |
| download | mariadb-git-4cde1d1259e5670f6673053c798aed52eab9879a.tar.gz | |
Bug#17382 mysql-test-run mysqldump fails with mysqlimport
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 98f9dd019b5..d95b4e39c6a 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -25,10 +25,13 @@ endif INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/regex \ - $(openssl_includes) $(yassl_includes) + $(openssl_includes) $(yassl_includes) LIBS = @CLIENT_LIBS@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ $(top_builddir)/libmysql/libmysqlclient.la +LDADD_R= @CLIENT_EXTRA_LDFLAGS@ \ + $(CLIENT_THREAD_LIBS) \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog \ mysqltestmanagerc mysqltestmanager-pwgen \ @@ -48,15 +51,11 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \ $(top_srcdir)/mysys/my_vle.c \ $(top_srcdir)/mysys/base64.c mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) -mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ - @CLIENT_EXTRA_LDFLAGS@ \ - $(top_builddir)/libmysql_r/libmysqlclient_r.la \ - $(top_builddir)/mysys/libmysys.a -mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ - @CLIENT_EXTRA_LDFLAGS@ \ - $(top_builddir)/libmysql_r/libmysqlclient_r.la \ - $(top_builddir)/mysys/libmysys.a -mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c +mysqlslap_LDADD = $(CXXLDFLAGS) $(LDADD_R) \ + $(top_builddir)/mysys/libmysys.a +mysqlimport_LDADD = $(CXXLDFLAGS) $(LDADD_R) \ + $(top_builddir)/mysys/libmysys.a +mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c mysqltestmanagerc_SOURCES= mysqlmanagerc.c $(yassl_dummy_link_fix) mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix) mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix) |