diff options
| author | unknown <brian@zim.tangent.org> | 2006-02-13 04:48:14 -0800 |
|---|---|---|
| committer | unknown <brian@zim.tangent.org> | 2006-02-13 04:48:14 -0800 |
| commit | 793f7e537226c3846c81b47cf6e74cc1faab80d5 (patch) | |
| tree | 4ed3d495aad023338d9c06d65cff2ca69fb85e83 /client/Makefile.am | |
| parent | 28094c8384abcc7f46f123bf200de21ccc70fe78 (diff) | |
| download | mariadb-git-793f7e537226c3846c81b47cf6e74cc1faab80d5.tar.gz | |
Made mysqlimport link against mysys so that it could make use of the safe mutex functions.
client/Makefile.am:
Additional linking
client/mysqlimport.c:
Removed undef
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 6a851cf2f2c..14ebadbfacb 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -49,7 +49,8 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \ $(top_srcdir)/mysys/base64.c mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) mysqlslap_LDADD = $(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) -mysqlimport_LDADD = $(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) +mysqlimport_LDADD = $(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ + $(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) @@ -58,7 +59,8 @@ mysqlslap_SOURCES= mysqlslap.c $(top_srcdir)/mysys/my_lock.c \ $(top_srcdir)/mysys/my_alarm.c \ $(yassl_dummy_link_fix) mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix) -mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix) +mysqlimport_SOURCES= mysqlimport.c \ + $(yassl_dummy_link_fix) sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc strings_src=decimal.c |