* 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.

diff --git a/ChangeLog b/ChangeLog
index 4eb44eba1d1bbaf6cdb6c34466d7b3e4e508ab81..b5cac40b30843d672aafeedeb176a9a517f63184 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2002-09-17  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * 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 77bbe9fc2a1948c3195814a4f83b04447680e5a6..401167ca928764f4ad292b31820387cf27fc58b8 100644 (file)
--- 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 acdddec38b5a991dfcef7952e6449a7d34bdd4d0..85f3e7188d2abade0026bab0066a4f34f6093783 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -869,16 +869,16 @@ register_channel 'automake', type => 'fatal', backtrace => 1,
             "####################\n"),
   footer => "\nPlease contact <bug-automake\@gnu.org>.";
 
-# 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 2d3db524bbdd499b90183bbade0b0ee2a271b1a9..57655c1107eb71c57adea6082a222282cf7a3d14 100644 (file)
--- 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 ec19dcd9c230ef30e7a3df1230fb53c3419764f5..cc15f3848dc9050a8a8d397990c4848fb05cec9c 100644 (file)
--- 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 6c4d3cdd2e6ae5d1ef2282ab2cbd4c5198784422..68292575012f1d58bdc670caae4e729ea94a420e 100755 (executable)
--- a/tests/warnopts.test
+++ b/tests/warnopts.test
@@ -43,7 +43,7 @@ SUBDIRS = sub
 END
 
 cat >sub/Makefile.am <<END
-AUTOMAKE_OPTIONS = -Wno-unused
+AUTOMAKE_OPTIONS = -Wno-syntax
 INCLUDES = -Ifoo
 foo_SOURCES = unused
 END

diff --git a/version.texi b/version.texi
index ec19dcd9c230ef30e7a3df1230fb53c3419764f5..cc15f3848dc9050a8a8d397990c4848fb05cec9c 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -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