From ae1ac019faac6df3ef86fb26834fe27cf03807f5 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 10 Mar 2006 10:51:36 +0000 Subject: [PATCH] * lib/Automake/ChannelDefs.pm: Make -Wportability the default in gnu and gnits modes. * doc/automake.texi (Invoking Automake): Adjust. --- ChangeLog | 6 ++++++ NEWS | 4 ++++ doc/automake.texi | 8 ++------ doc/stamp-vti | 4 ++-- doc/version.texi | 4 ++-- lib/Automake/ChannelDefs.pm | 25 ++++--------------------- 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac3e4a6e..269b2a1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-10 Alexandre Duret-Lutz + + * lib/Automake/ChannelDefs.pm: Make -Wportability the default in + gnu and gnits modes. + * doc/automake.texi (Invoking Automake): Adjust. + 2006-02-21 Ralf Wildenhues * doc/automake.texi (Yacc and Lex): Document that `.ypp' and diff --git a/NEWS b/NEWS index ae0120c0..83d6e0b0 100644 --- a/NEWS +++ b/NEWS @@ -93,6 +93,10 @@ New in 1.9a: that have been declared as programs in the same Makefile. This is mostly useful when some check_PROGRAMS are listed in TESTS. + - `-Wportability' has finally been turned on by default for `gnu' and + `gnits' strictness. This means automake will complain about %-rules + or $(GNU Make functions) unless you switch to `foreign' strictness or + use `-Wno-portability'. New in 1.9: diff --git a/doc/automake.texi b/doc/automake.texi index ab87b22b..c9ffb9b2 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -1253,12 +1253,8 @@ instance, @option{-Wno-syntax} will hide the warnings about unused variables. The categories output by default are @samp{syntax} and -@samp{unsupported}. Additionally, @samp{gnu} is enabled in @option{--gnu} and -@option{--gnits} strictness. - -@samp{portability} warnings are currently disabled by default, but they -will be enabled in @option{--gnu} and @option{--gnits} strictness in a -future release. +@samp{unsupported}. Additionally, @samp{gnu} and @samp{portability} +are enabled in @option{--gnu} and @option{--gnits} strictness. @vindex WARNINGS The environment variable @env{WARNINGS} can contain a comma separated diff --git a/doc/stamp-vti b/doc/stamp-vti index 86ad4dfc..78ae3926 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 21 February 2006 -@set UPDATED-MONTH February 2006 +@set UPDATED 10 March 2006 +@set UPDATED-MONTH March 2006 @set EDITION 1.9a @set VERSION 1.9a diff --git a/doc/version.texi b/doc/version.texi index 86ad4dfc..78ae3926 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 21 February 2006 -@set UPDATED-MONTH February 2006 +@set UPDATED 10 March 2006 +@set UPDATED-MONTH March 2006 @set EDITION 1.9a @set VERSION 1.9a diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm index 26d180a6..0a6e3690 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2006 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 @@ -324,29 +324,12 @@ sub set_strictness ($) { my ($name) = @_; - # FIXME: 'portability' warnings are currently disabled by default. - # Eventually we want to turn them on in GNU and GNITS modes, but - # we don't do this yet in Automake 1.7 to help the 1.6/1.7 transition. - # - # Indeed there would be only two ways to get rid of these new warnings: - # 1. adjusting Makefile.am - # This is not always easy (or wanted). Consider %-rules or - # $(function args) variables. - # 2. using -Wno-portability - # This means there is no way to have the same Makefile.am - # working both with Automake 1.6 and 1.7 (since 1.6 does not - # understand -Wno-portability). - # - # In Automake 1.8 (or whatever it is called) we can turn these - # warnings on, since -Wno-portability will not be an issue for - # the 1.7/1.8 transition. - if ($name eq 'gnu') { setup_channel 'error-gnu', silent => 0; setup_channel 'error-gnu/warn', silent => 0, type => 'error'; setup_channel 'error-gnits', silent => 1; - # setup_channel 'portability', silent => 0; + setup_channel 'portability', silent => 0; setup_channel 'gnu', silent => 0; } elsif ($name eq 'gnits') @@ -354,7 +337,7 @@ sub set_strictness ($) setup_channel 'error-gnu', silent => 0; setup_channel 'error-gnu/warn', silent => 0, type => 'error'; setup_channel 'error-gnits', silent => 0; - # setup_channel 'portability', silent => 0; + setup_channel 'portability', silent => 0; setup_channel 'gnu', silent => 0; } elsif ($name eq 'foreign') @@ -362,7 +345,7 @@ sub set_strictness ($) setup_channel 'error-gnu', silent => 1; setup_channel 'error-gnu/warn', silent => 0, type => 'warning'; setup_channel 'error-gnits', silent => 1; - # setup_channel 'portability', silent => 1; + setup_channel 'portability', silent => 1; setup_channel 'gnu', silent => 1; } else -- 2.43.5