* automake.in (handle_footer): Do not output an unformatted

definition of SOURCES, it is already done correctly in
generate_makefile.  This superfluous definition introduced long
lines in some Makefiles, hence breakages in tools with a limited
line length.  Report from Mathias Froehlich.

diff --git a/ChangeLog b/ChangeLog
index 78951de..db9f54f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-22  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (handle_footer): Do not output an unformatted
+       definition of SOURCES, it is already done correctly in
+       generate_makefile.  This superfluous definition introduced long
+       lines in some Makefiles, hence breakages in tools with a limited
+       line length.  Report from Mathias Froehlich.
+
 2005-06-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):

diff --git a/THANKS b/THANKS
index 887b926..3d13303 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -159,6 +159,7 @@ Martin Bravenboer       martin@cs.uu.nl
 Martin Frydl           martin@idoox.com
 Martin Waitz           tali@admingilde.org
 Mathias Doreille       doreille@smr.ch
+Mathias Froehlich      M.Froehlich@science-computing.de
 Matt Leach             mleach@cygnus.com
 Matthew D. Langston    langston@SLAC.Stanford.EDU
 Matthias Andree                matthias.andree@gmx.de

diff --git a/automake.in b/automake.in
index 514bc13..437ade7 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4239,11 +4239,6 @@ sub handle_gettext
 # Handle footer elements.
 sub handle_footer
 {
-    # NOTE don't use define_pretty_variable here, because
-    # $contents{...} is already defined.
-    $output_vars .= 'SOURCES = ' . variable_value ('SOURCES') . "\n\n"
-      if variable_value ('SOURCES');
-
     reject_rule ('.SUFFIXES',
                 "use variable `SUFFIXES', not target `.SUFFIXES'");