From 948b9831a8c367fcedec05e3b85b835fd59c0ab8 Mon Sep 17 00:00:00 2001 From: "cmiller@calliope.local" <> Date: Thu, 2 Nov 2006 14:26:54 -0500 Subject: [PATCH] Fixed misuse of automake _DEPENDENCIES item. It caused Make try to create a bogus dependency "-lz" . --- sql/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sql/Makefile.am b/sql/Makefile.am index 38a99aaef88..4781c1d675d 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -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@ \