summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorkent@mysql.com <>2005-07-06 00:06:11 +0200
committerkent@mysql.com <>2005-07-06 00:06:11 +0200
commit8e3b393d5ced1ea4788bcfbd0547f617d6aec8e1 (patch)
tree1adb92a14ccbe505c0035f0f41b8f01c288979b0 /tools
parent81cf9394bfee5cae866743afcc97b6d3dee782d5 (diff)
parenta7be42163a635d80516ce9398881091fc0e6a63b (diff)
downloadmariadb-git-8e3b393d5ced1ea4788bcfbd0547f617d6aec8e1.tar.gz
Merge
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 651ef2d22b3..0f726bd5fc3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,11 +20,11 @@ if HAVE_YASSL
else
yassl_dummy_link_fix=
endif
-INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
- -I$(top_builddir)/include
-LDADD= @CLIENT_EXTRA_LDFLAGS@ \
- $(top_builddir)/libmysql_r/libmysqlclient_r.la \
- @openssl_libs@ @ZLIB_LIBS@
+INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
+ $(openssl_includes)
+LDADD= @CLIENT_EXTRA_LDFLAGS@ \
+ $(top_builddir)/libmysql_r/libmysqlclient_r.la \
+ @openssl_libs@ @ZLIB_LIBS@
bin_PROGRAMS= mysqltestmanager
mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix)
mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)