Rename `silent' mode to `silent-rules' mode.

* automake.in (define_verbose_var, verbose_flag)
(define_verbose_tagvar, handle_options, handle_languages)
(handle_configure, parse_arguments): Rename the `silent' option
to `silent-rules', so it coincides with the `--silent-rules'
command line option; adjust all code and comments.
* lib/Automake/Options.pm (_process_option_list): Likewise.
* doc/automake.texi (Invoking Automake, Libtool Flags, Options):
Likewise.
* NEWS: Adjust.
* tests/dollarvar.test, tests/silent.test, tests/silent2.test,
tests/silent3.test, tests/silent4.test, tests/silent5.test,
tests/silent6.test, tests/silent7.test: Likewise.
Suggestion by Jan Engelhardt.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index bed1374c0f357608e74d33d4dfa84e1ded4195ae..a29799c0553279082f4d3d188ef8895a34f26591 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-03-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Rename `silent' mode to `silent-rules' mode.
+       * automake.in (define_verbose_var, verbose_flag)
+       (define_verbose_tagvar, handle_options, handle_languages)
+       (handle_configure, parse_arguments): Rename the `silent' option
+       to `silent-rules', so it coincides with the `--silent-rules'
+       command line option; adjust all code and comments.
+       * lib/Automake/Options.pm (_process_option_list): Likewise.
+       * doc/automake.texi (Invoking Automake, Libtool Flags, Options):
+       Likewise.
+       * NEWS: Adjust.
+       * tests/dollarvar.test, tests/silent.test, tests/silent2.test,
+       tests/silent3.test, tests/silent4.test, tests/silent5.test,
+       tests/silent6.test, tests/silent7.test: Likewise.
+       Suggestion by Jan Engelhardt.
+
 2009-03-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        `silent' mode unconditionally overrides portability-recursive.

diff --git a/NEWS b/NEWS
index 697575104934845045dcaffc64d9bbb9382fb5c6..885abc0dcdf4974aefa762e6bc62f3e50adcd8d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -109,7 +109,7 @@ New in 1.10a:
 
   - The `color-tests' option causes colored test result output on terminals.
 
-  - The `silent' option enables Linux kernel-style silent build output.
+  - The `silent-rules' option enables Linux kernel-style silent build output.
     This option requires the widely supported but non-POSIX `make' feature
     of recursive variable expansion, so do not use it if your package needs
     to build with `make' implementations that do not support it.

diff --git a/automake.in b/automake.in
index 9ee9dfd86c5e77af61dc1786240ea409fd5f6f4e..cb4d1de61193ebc144690acd544ebb00a862dd26 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1111,11 +1111,11 @@ sub backname ($)
 
 ################################################################
 
-# Silent mode handling functions.
+# `silent-rules' mode handling functions.
 
 # verbose_var (NAME)
 # ------------------
-# The public variable stem used to implement `silent'.
+# The public variable stem used to implement `silent-rules'.
 sub verbose_var ($)
 {
     my ($name) = @_;
@@ -1124,7 +1124,7 @@ sub verbose_var ($)
 
 # verbose_private_var (NAME)
 # --------------------------
-# The naming policy for the private variables used to implement `silent'.
+# The naming policy for the private variables for `silent-rules'.
 sub verbose_private_var ($)
 {
     my ($name) = @_;
@@ -1133,13 +1133,13 @@ sub verbose_private_var ($)
 
 # define_verbose_var (NAME, VAL)
 # ------------------------------
-# For `silent' mode, setup VAR and dispatcher, to expand to VAL if silent.
+# For `silent-rules' mode, setup VAR and dispatcher, to expand to VAL if silent.
 sub define_verbose_var ($$)
 {
     my ($name, $val) = @_;
     my $var = verbose_var ($name);
     my $pvar = verbose_private_var ($name);
-    if (option 'silent')
+    if (option 'silent-rules')
       {
        # Using `$V' instead of `$(V)' breaks IRIX make.
        define_variable ($var, '$(' . $pvar . '_$(V))', INTERNAL);
@@ -1157,7 +1157,7 @@ sub verbose_flag ($)
 {
     my ($name) = @_;
     return '$(' . verbose_var ($name) . ')'
-      if (option 'silent');
+      if (option 'silent-rules');
     return '';
 }
 
@@ -1171,11 +1171,11 @@ sub silent_flag ()
 
 # define_verbose_tagvar (NAME)
 # ----------------------------
-# Engage the needed `silent' machinery for tag NAME.
+# Engage the needed `silent-rules' machinery for tag NAME.
 sub define_verbose_tagvar ($)
 {
     my ($name) = @_;
-    if (option 'silent')
+    if (option 'silent-rules')
       {
        define_verbose_var ($name, '@echo "  '. $name . ' ' x (6 - length ($name)) . '" $@;');
        define_verbose_var ('at', '@');
@@ -1184,7 +1184,7 @@ sub define_verbose_tagvar ($)
 
 # define_verbose_libtool
 # ----------------------
-# Engage the needed `silent' machinery for `libtool --silent'.
+# Engage the needed `silent-rules' machinery for `libtool --silent'.
 sub define_verbose_libtool ()
 {
     define_verbose_var ('lt', '--silent');
@@ -1216,7 +1216,7 @@ sub handle_options
 
   # Override portability-recursive warning.
   switch_warning ('no-portability-recursive')
-    if option 'silent';
+    if option 'silent-rules';
 
   if ($strictness == GNITS)
     {
@@ -1654,7 +1654,7 @@ sub handle_languages
        define_linker_variable ($languages{'c'});
       }
 
-    # Always provide the user with `AM_V_GEN' for `silent' mode.
+    # Always provide the user with `AM_V_GEN' for `silent-rules' mode.
     define_verbose_tagvar ('GEN');
 }
 
@@ -4180,7 +4180,7 @@ sub handle_configure ($$$@)
 
   my $automake_options = '--' . (global_option 'cygnus' ? 'cygnus' : $strictness_name)
                         . (global_option 'no-dependencies' ? ' --ignore-deps' : '')
-                        . (global_option 'silent' ? ' --silent-rules' : '');
+                        . (global_option 'silent-rules' ? ' --silent-rules' : '');
 
   $output_rules .= file_contents
     ('configure',
@@ -8148,7 +8148,8 @@ sub parse_arguments ()
      'o|output-dir=s'  => \$output_directory,
      'a|add-missing'   => \$add_missing,
      'c|copy'          => \$copy_missing,
-     'silent-rules'    => sub { set_global_option ('silent', $cli_where); },
+     'silent-rules'    => sub { set_global_option ('silent-rules',
+                                                   $cli_where); },
      'v|verbose'       => sub { setup_channel 'verb', silent => 0; },
      'W|warnings=s'     => \&parse_warnings,
      # These long options (--Werror and --Wno-error) for backward

diff --git a/doc/automake.texi b/doc/automake.texi
index 2a22ca4680c72efce328184800ef583f57bc7f4c..fc072fd13b75012f2912f55f21b9da0a88763bf6 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2517,7 +2517,7 @@ removed in a future release.
 
 @item --silent-rules
 @opindex --silent-rules
-Enable the @option{silent} option globally (@pxref{Options}).
+Enable the @option{silent-rules} option globally (@pxref{Options}).
 
 @item -v
 @itemx --verbose
@@ -2566,7 +2566,7 @@ variables.
 The categories output by default are @samp{syntax} and
 @samp{unsupported}.  Additionally, @samp{gnu} and @samp{portability}
 are enabled in @option{--gnu} and @option{--gnits} strictness.
-On the other hand, the @option{silent} options (@pxref{Options})
+On the other hand, the @option{silent-rules} options (@pxref{Options})
 turns off portability warnings about recursive variable expansions.
 
 @vindex WARNINGS
@@ -5268,8 +5268,8 @@ The libtool rules also use a @code{LIBTOOLFLAGS} variable that should
 not be set in @file{Makefile.am}: this is a user variable (@pxref{Flag
 Variables Ordering}.  It allows users to run @samp{make
 LIBTOOLFLAGS=--silent}, for instance.  Note that the verbosity of
-@command{libtool} can also be influenced with the Automake @option{silent}
-option (@pxref{Options}).
+@command{libtool} can also be influenced with the Automake
+@option{silent-rules} option (@pxref{Options}).
 
 
 @node LTLIBOBJS, Libtool Issues, Libtool Flags, A Shared Library
@@ -8701,9 +8701,9 @@ non-alpha releases.  The second form is
 @samp{@var{MAJOR}.@var{MINOR}@var{ALPHA}}, where @var{ALPHA} is a
 letter; it should be omitted for non-alpha releases.
 
-@item @option{silent}
-@cindex Option, @option{silent}
-@opindex silent
+@item @option{silent-rules}
+@cindex Option, @option{silent-rules}
+@opindex silent-rules
 Enable silent build rules.  This will cause many build rules to output a
 status line of the form
 
@@ -8727,9 +8727,9 @@ file, to allow the user to override the value for subdirectories as well.
 The current implementation of this feature relies on a non-POSIX, but in
 practice rather widely supported @file{Makefile} construct of nested
 variable expansion @samp{$(@var{var1}$(V))}.  Do not use the
-@option{silent} option if your package needs to build with
+@option{silent-rules} option if your package needs to build with
 @command{make} implementations that do not support it.  The
-@option{silent} option turns off warnings about recursive variable
+@option{silent-rules} option turns off warnings about recursive variable
 expansion, which are in turn enabled by @option{-Wportability}
 (@pxref{Invoking Automake}).
 

diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 10fd00f67d65e4aee32c300e875f11eca6fe133e..3890caf0ab33d86d356a4dbf1112d206775074ac 100644 (file)
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -267,7 +267,7 @@ sub _process_option_list (\%$@)
             || $_ eq 'no-exeext' || $_ eq 'no-define'
             || $_ eq 'std-options'
             || $_ eq 'color-tests'
-            || $_ eq 'silent'
+            || $_ eq 'silent-rules'
             || $_ eq 'cygnus' || $_ eq 'no-dependencies')
        {
          # Explicitly recognize these.

diff --git a/tests/dollarvar.test b/tests/dollarvar.test
index 5b79eb0d412e5071d8de14eabe99a1fcc94f232b..8dc54f7ad18d0ad65bf9686c2db079d13d14df89 100755 (executable)
--- a/tests/dollarvar.test
+++ b/tests/dollarvar.test
@@ -17,7 +17,7 @@
 # Test to make sure that -Wportability complains about recursive
 # variable expansions and variables containing `$', `$(...)', or
 # `${...}' in the name.  We support recursive variable expansions using
-# the latter two constructs for the `silent' option, and they are
+# the latter two constructs for the `silent-rules' option, and they are
 # rather widely supported in practice.  OTOH variable definitions
 # containing a `$' on the left hand side of an assignment are not
 # portable in practice, even though POSIX allows them.  :-/
@@ -45,8 +45,8 @@ grep 'Makefile.am:5' stderr
 grep 'Makefile.am:6' stderr
 grep 'Makefile.am:7' stderr
 
-# On the other hand, if we allow `silent' mode, then we need to allow
-# recursive variable expansion, too.
+# On the other hand, if we allow `silent-rules' mode, then we need to
+# allow recursive variable expansion, too.
 
 # This should work with the `--silent-rules' command line switch.
 AUTOMAKE_fails -Wportability --silent-rules
@@ -58,7 +58,7 @@ grep 'Makefile.am:6' stderr && Exit 1
 grep 'Makefile.am:7' stderr && Exit 1
 
 # This should work with AUTOMAKE_OPTIONS.
-echo 'AUTOMAKE_OPTIONS = silent' >> Makefile.am
+echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
 
 AUTOMAKE_fails -Wportability
 grep 'Makefile.am:2' stderr

diff --git a/tests/silent.test b/tests/silent.test
index b3c03e4d802c1f0acfd74eeb11be658a16c6ea03..b39d49c0d5f2fda65aac33839b33ffdf531d7825 100755 (executable)
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent mode, without libtool, standard depmode case.
+# Check silent-rules mode, without libtool, standard depmode case.
 
 # Please keep this file in sync with silent2.test.
 
@@ -32,7 +32,7 @@ AC_OUTPUT
 EOF
 
 cat > Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent
+AUTOMAKE_OPTIONS = silent-rules
 # Need generic and non-generic rules.
 bin_PROGRAMS = foo bar
 bar_CFLAGS = $(AM_CFLAGS)
@@ -40,7 +40,7 @@ SUBDIRS = sub
 EOF
 
 cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent subdir-objects
+AUTOMAKE_OPTIONS = silent-rules subdir-objects
 # Need generic and non-generic rules.
 bin_PROGRAMS = baz bla
 bla_CFLAGS = $(AM_CFLAGS)

diff --git a/tests/silent2.test b/tests/silent2.test
index 136952e5324a2ad46989c0598435d6e04775d185..a1149f45b6f984edd9f32e93bf3665861f4328cf 100755 (executable)
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent mode, without libtool, non-fastdep case
+# Check silent-rules mode, without libtool, non-fastdep case
 # (so that, with GCC, we also cover the other code paths in depend2).
 
 # Please keep this file in sync with silent.test.
@@ -34,7 +34,7 @@ AC_OUTPUT
 EOF
 
 cat > Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent
+AUTOMAKE_OPTIONS = silent-rules
 # Need generic and non-generic rules.
 bin_PROGRAMS = foo bar
 bar_CFLAGS = $(AM_CFLAGS)
@@ -42,7 +42,7 @@ SUBDIRS = sub
 EOF
 
 cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent subdir-objects
+AUTOMAKE_OPTIONS = silent-rules subdir-objects
 # Need generic and non-generic rules.
 bin_PROGRAMS = baz bla
 bla_CFLAGS = $(AM_CFLAGS)

diff --git a/tests/silent3.test b/tests/silent3.test
index 0df2bae22426d06bff12a2df780061c6f805707b..5e2ecda7580bb192f551f2a3ed66ed7c98bfd6c8 100755 (executable)
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent mode, with libtool, standard depmode case.
+# Check silent-rules mode, with libtool, standard depmode case.
 
 # Please keep this file in sync with silent4.test.
 
@@ -34,7 +34,7 @@ AC_OUTPUT
 EOF
 
 cat > Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent
+AUTOMAKE_OPTIONS = silent-rules
 # Need generic and non-generic rules.
 lib_LTLIBRARIES = libfoo.la libbar.la
 libbar_la_CFLAGS = $(AM_CFLAGS)
@@ -42,7 +42,7 @@ SUBDIRS = sub
 EOF
 
 cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent subdir-objects
+AUTOMAKE_OPTIONS = silent-rules subdir-objects
 # Need generic and non-generic rules.
 lib_LTLIBRARIES = libbaz.la libbla.la
 libbla_la_CFLAGS = $(AM_CFLAGS)

diff --git a/tests/silent4.test b/tests/silent4.test
index dc897cb2336baa42d1907b3df6a1ec992852a3db..7ed8922a66105d2c66520022edcbfe553b97c1d4 100755 (executable)
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent mode, with libtool, non-fastdep case
+# Check silent-rules mode, with libtool, non-fastdep case
 # (so that, with GCC, we also cover the other code paths in depend2).
 
 # Please keep this file in sync with silent3.test.
@@ -35,7 +35,7 @@ AC_OUTPUT
 EOF
 
 cat > Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent
+AUTOMAKE_OPTIONS = silent-rules
 # Need generic and non-generic rules.
 lib_LTLIBRARIES = libfoo.la libbar.la
 libbar_la_CFLAGS = $(AM_CFLAGS)
@@ -43,7 +43,7 @@ SUBDIRS = sub
 EOF
 
 cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent subdir-objects
+AUTOMAKE_OPTIONS = silent-rules subdir-objects
 # Need generic and non-generic rules.
 lib_LTLIBRARIES = libbaz.la libbla.la
 libbla_la_CFLAGS = $(AM_CFLAGS)

diff --git a/tests/silent5.test b/tests/silent5.test
index 4a2fd5d804d71583df9602da75f930f324dbe251..90e21b91ba626b3b141dfe1835af814129c7c5a6 100755 (executable)
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent mode, languages other than C.
+# Check silent-rules mode, languages other than C.
 
 required='g++ gfortran flex bison'
 . ./defs
@@ -35,7 +35,7 @@ AC_OUTPUT
 EOF
 
 cat > Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent
+AUTOMAKE_OPTIONS = silent-rules
 # Need generic and non-generic rules.
 bin_PROGRAMS = foo bar
 bar_CFLAGS = $(AM_CFLAGS)
@@ -47,7 +47,7 @@ BUILT_SOURCES = foo6.h
 EOF
 
 cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = silent subdir-objects
+AUTOMAKE_OPTIONS = silent-rules subdir-objects
 # Need generic and non-generic rules.
 bin_PROGRAMS = baz bla
 bla_CFLAGS = $(AM_CFLAGS)

diff --git a/tests/silent6.test b/tests/silent6.test
index 103cd342369779d459fee58d469332010a706f31..b0cacc8b6dab6b3707996d2f869ac8fc43890fd1 100755 (executable)
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check user extensibility of silent mode.
+# Check user extensibility of silent-rules mode.
 
 . ./defs
 
@@ -89,7 +89,7 @@ grep ' --silent-rules' Makefile.in
 $AUTOMAKE --force -Wno-all -Wportability --silent-rules
 grep ' --silent-rules' Makefile.in
 
-echo 'AUTOMAKE_OPTIONS = silent' >> Makefile.am
+echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
 $AUTOMAKE --force
 grep 'AM_V_GEN' Makefile.in
 $AUTOMAKE --force -Wno-all -Wportability

diff --git a/tests/silent7.test b/tests/silent7.test
index 4fd52f32383317fe581f75d23ebbd5c793c38de0..68a0e89ab04edf227f9fd0f02d327f91299f5766 100755 (executable)
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check user extensibility of silent mode.
+# Check user extensibility of silent-rules mode.
 
 . ./defs
 
@@ -51,7 +51,7 @@ grep 'echo ' stdout
 
 $MAKE distclean
 
-echo 'AUTOMAKE_OPTIONS = silent' >> Makefile.am
+echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
 $AUTOMAKE
 
 ./configure