diff options
| author | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
| commit | ad0516d91e5b41286bbadc716a350b244ad8337e (patch) | |
| tree | 1adb92a14ccbe505c0035f0f41b8f01c288979b0 /tools | |
| parent | 711464a11de68abe5835a74a41f7c347a1e93b67 (diff) | |
| parent | b0a6a8e13780182a172b2c0a5b6ef008b6d0645f (diff) | |
| download | mariadb-git-ad0516d91e5b41286bbadc716a350b244ad8337e.tar.gz | |
Merge
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
tests/Makefile.am:
Auto merged
vio/Makefile.am:
SCCS merged
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 10 |
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) |