Commit 9dd9cf5a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  calliope.local:/Volumes/Source/src/mysql-5.1-maint
parents bbbfb2e7 e3840255

sql/Makefile.am

+4 −3
Original line number Diff line number Diff line
@@ -30,12 +30,13 @@ libexec_PROGRAMS = mysqld 
EXTRA_PROGRAMS =	gen_lex_hash

bin_PROGRAMS =		mysql_tzinfo_to_sql

gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@

LDADD =			$(top_builddir)/vio/libvio.a \

SUPPORTING_LIBS =			$(top_builddir)/vio/libvio.a \

			$(top_builddir)/mysys/libmysys.a \

			$(top_builddir)/dbug/libdbug.a \

			$(top_builddir)/regex/libregex.a \

			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@

mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(LDADD)

			$(top_builddir)/strings/libmystrings.a

mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS)

LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@

mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \

			@pstack_libs@ \

			@mysql_plugin_libs@ \