From: Ralf Wildenhues Date: Sun, 11 Apr 2010 18:31:19 +0000 (+0200) Subject: Fix connected warnings about obsolete exeext override. X-Git-Tag: ng-0.5a~432 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da765822f02f0e66b6e3b4a01e2ac08f5c837164;p=thirdparty%2Fautomake.git Fix connected warnings about obsolete exeext override. * lib/Automake/Rule.pm (define): Merge two warnings that belong together, by setting the 'partial' flag for the first one. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 19b77724e..9a0b3329c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-11 Ralf Wildenhues + Fix connected warnings about obsolete exeext override. + * lib/Automake/Rule.pm (define): Merge two warnings that belong + together, by setting the 'partial' flag for the first one. + Fix per-Makefile.am setting of -Werror. Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one Makefile.am would carry over to other Makefile.am files diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index 68b3ea51f..d7e71055c 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -1,4 +1,5 @@ -# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation, +# Inc. # 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 @@ -615,7 +616,8 @@ sub define ($$$$$) msg ('obsolete', $tdef->location, "deprecated feature: target `$noexe' overrides " . "`$noexe\$(EXEEXT)'\n" - . "change your target to read `$noexe\$(EXEEXT)'"); + . "change your target to read `$noexe\$(EXEEXT)'", + partial => 1); msg ('obsolete', $where, "target `$target' was defined here"); } # Don't `return ()' now, as this might hide target clashes