diff options
author | unknown <konstantin@mysql.com> | 2004-07-27 10:05:56 -0700 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2004-07-27 10:05:56 -0700 |
commit | 5217955d1a5268fb8cf9e0c4293460725572733d (patch) | |
tree | 33f68cd1e472a560f82f0f039e0f061b62f0f371 /tools | |
parent | 906ad26dc5466bfc98513d2529256f4f95214893 (diff) | |
parent | 6a371e242b7ee7549089233662d0b2c369e51d64 (diff) | |
download | mariadb-git-5217955d1a5268fb8cf9e0c4293460725572733d.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib
configure.in:
Auto merged
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.am | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 0dc0b90c60e..0dc90a0d107 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,23 @@ -INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) -LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la @openssl_libs@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Process this file with automake to create Makefile.in + +INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) +LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ @ZLIB_LIBS@ \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la bin_PROGRAMS= mysqlmanager mysqlmanager_SOURCES= mysqlmanager.c mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |