From 744598bb07bfa58224424a8050bdde5b70220e99 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 17 Sep 2002 18:07:23 +0000 Subject: [PATCH] * automake.in: Rename the 'unused' channel to 'syntax'. (variable_defined): Issue a warning instead of an error for variable-is-a-target conditions. * automake.texi (Invoking Automake): Rename the 'unused' channel to 'syntax'. * tests/warnopts.test: Likewise. --- ChangeLog | 7 +++++++ aclocal.m4 | 2 +- automake.in | 21 +++++++++++---------- automake.texi | 14 +++++++------- stamp-vti | 2 +- tests/warnopts.test | 2 +- version.texi | 2 +- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4eb44eba..b5cac40b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2002-09-17 Alexandre Duret-Lutz + * automake.in: Rename the 'unused' channel to 'syntax'. + (variable_defined): Issue a warning instead of an error + for variable-is-a-target conditions. + * automake.texi (Invoking Automake): Rename the 'unused' + channel to 'syntax'. + * tests/warnopts.test: Likewise. + * tests/suffix8.test: Add explicit dependencies. * tests/texinfo13.test, tests/texinfo16.test: Require tex. diff --git a/aclocal.m4 b/aclocal.m4 index 77bbe9fc..401167ca 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.6c -*- Autoconf -*- +# generated automatically by aclocal -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. diff --git a/automake.in b/automake.in index acdddec3..85f3e718 100755 --- a/automake.in +++ b/automake.in @@ -869,16 +869,16 @@ register_channel 'automake', type => 'fatal', backtrace => 1, "####################\n"), footer => "\nPlease contact ."; -# Warnings about unsupported (or mis-supported) features. -register_channel 'unsupported', type => 'warning'; -# Unused variables. -register_channel 'unused', type => 'warning'; +# Warnings related to GNU Coding Standards. +register_channel 'gnu', type => 'warning'; # Warnings about obsolete features (silent by default). register_channel 'obsolete', type => 'warning', silent => 1; # Warnings about non-portable constructs. register_channel 'portability', type => 'warning', silent => 1; -# Warnings related to GNU Coding Standards. -register_channel 'gnu', type => 'warning'; +# Weird syntax, unused variables, typos... +register_channel 'syntax', type => 'warning'; +# Warnings about unsupported (or mis-supported) features. +register_channel 'unsupported', type => 'warning'; # For &verb. register_channel 'verb', type => 'debug', silent => 1; @@ -3440,7 +3440,7 @@ sub check_typos () foreach my $primary ('_SOURCES', '_LIBADD', '_LDADD', '_LDFLAGS', '_DEPENDENCIES') { - msg_var 'unused', $varname, "unused variable: `$varname'" + msg_var 'syntax', $varname, "unused variable: `$varname'" # Note that a configure variable is always legitimate. if ($varname =~ /$primary$/ && ! $content_seen{$varname} && ! exists $configure_vars{$varname}); @@ -6519,7 +6519,8 @@ sub variable_defined ($;$) # to create rules for things like `bin_PROGRAMS = LDADD'. if ($target_owner{$var}{$tcond} == TARGET_USER) { - err_cond_target ($tcond, $var, "`$var' is a target; " + msg_cond_target ('syntax', $tcond, $var, + "`$var' is a target; " . "expected a variable"); return 0; } @@ -8969,9 +8970,9 @@ Library files: Warning categories include: `gnu' GNU coding standards (default in gnu and gnits modes) `obsolete' obsolete features or constructions - `unsupported' unsupported or incomplete features (default) - `unused' unused variables (default) `portability' portability issues + `syntax' dubious syntactic constructs (default) + `unsupported' unsupported or incomplete features (default) `all' all the warnings `no-CATEGORY' turn off warnings in CATEGORY `none' turn off all the warnings diff --git a/automake.texi b/automake.texi index 2d3db524..57655c11 100644 --- a/automake.texi +++ b/automake.texi @@ -1040,12 +1040,12 @@ warnings related to the GNU Coding Standards (@pxref{Top, , , standards, The GNU Coding Standards}). @item obsolete obsolete features or constructions -@item unsupported -unsupported or incomplete features -@item unused -unused variables @item portability portability issues (e.g., use of Make features which are known not portable) +@item syntax +weird syntax, unused variables, typos +@item unsupported +unsupported or incomplete features @item all all the warnings @item none @@ -1055,11 +1055,11 @@ treat warnings as errors @end table A category can be turned off by prefixing its name with @samp{no-}. For -instance @samp{-Wno-unused} will hide the warnings about unused +instance @samp{-Wno-syntax} will hide the warnings about unused variables. -The categories output by default are @samp{unsupported} and -@samp{unused}. Additionally, @samp{gnu} is enabled in @samp{--gnu} and +The categories output by default are @samp{syntax} and +@samp{unsupported}. Additionally, @samp{gnu} is enabled in @samp{--gnu} and @samp{--gnits} strictness. @samp{portability} warnings are currently disabled by default, but they diff --git a/stamp-vti b/stamp-vti index ec19dcd9..cc15f384 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 16 September 2002 +@set UPDATED 17 September 2002 @set UPDATED-MONTH September 2002 @set EDITION 1.6c @set VERSION 1.6c diff --git a/tests/warnopts.test b/tests/warnopts.test index 6c4d3cdd..68292575 100755 --- a/tests/warnopts.test +++ b/tests/warnopts.test @@ -43,7 +43,7 @@ SUBDIRS = sub END cat >sub/Makefile.am <