Commit ad0516d9 authored Jul 06, 2005 by unknown

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

parents 711464a1 b0a6a8e1

client/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ else
		yassl_dummy_link_fix=
		endif
		#AUTOMAKE_OPTIONS = nostdinc
		INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \
		$(openssl_includes) -I$(top_builddir)/include
		INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
		-I$(top_srcdir)/regex $(openssl_includes)
		LIBS = @CLIENT_LIBS@
		LDADD= @CLIENT_EXTRA_LDFLAGS@ \
		$(top_builddir)/libmysql/libmysqlclient.la

cmd-line-utils/libedit/Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,8 @@
		ASRC=vi.c emacs.c common.c
		AHDR=vi.h emacs.h common.h

		INCLUDES = -I$(top_srcdir)/include -I$(srcdir)/../.. -I..
		INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
		-I$(srcdir)/../.. -I..

		noinst_LIBRARIES = libedit.a

cmd-line-utils/readline/Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,8 @@
		# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.

		# Last -I$(top_srcdir) needed for RedHat!
		INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
		INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
		-I$(top_srcdir)

		noinst_LIBRARIES = libreadline.a

dbug/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
		# MA 02111-1307, USA

		INCLUDES = -I$(top_srcdir)/include
		INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
		LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a
		pkglib_LIBRARIES = libdbug.a
		noinst_HEADERS = dbug_long.h

extra/Makefile.am

+2 −3

Original line number	Diff line number	Diff line
		@@ -14,9 +14,8 @@
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

		INCLUDES = -I$(top_srcdir)/include \
		@ndbcluster_includes@ -I$(top_srcdir)/sql \
		-I$(top_builddir)/include
		INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
		@ndbcluster_includes@ -I$(top_srcdir)/sql
		LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
		../dbug/libdbug.a ../strings/libmystrings.a
		BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \