More work on `silent rules' mode

* bootstrap (silent_rules_prog): Preserve leading
whitespace verbatim, when inserting the AM_V variables.
Suggested by Ralf Wildenhues.
Optionally insert the definitions of
AM_DEFAULT_VERBOSITY, AM_V_GEN and AM_V_at: useful for
po/Makefile.in.in
(silentize): New function.
(slurp): Call silentize
Call silentize on po/Makefile.in.in.
* doc/Makefile.am, etc/Makefile.am,
pies/Makefile.am, pmult/Makefile.am,
tests/Makefile.am, tests/etc/Makefile.am: Add silent rule markers.

1 files changed, 33 insertions, 18 deletions

diff --git a/bootstrap b/bootstrap
index 750dc3c..bf5909c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -430,21 +430,29 @@ silent_rules_prog='
 # state = 1 - first line inside a rule
 # state = 2 - subsequent lines inside a rule
 # cont  = 1 - this line is a continuation of the previous one
-
+# defn  = 1 - insert AM_V_GEN/AM_V_at definitions after the initail comment
 # Print comment lines
 /^[ \t]*#/ { print; next }
+# Insert AM_V_ definitions, if required.
+state == 0 && defn == 1 {
+   print "AM_DEFAULT_VERBOSITY=0" # FIXME
+   print "AM_V_GEN = $(am__v_GEN_$(V))"
+   print "am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))"
+   print "am__v_GEN_0 = @echo \"  GEN   \" $@;"
+   print "AM_V_at = $(am__v_at_$(V))"
+   print "am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))"
+   print "am__v_at_0 = @"
+   defn = 0
+}
 # Start of a rule
 /^[^ \t].*:/ { print; state = 1; cont = 0; next }
 # First action within the rule
 state == 1 && /^\t/ {
         # Print silent rules without changes.  The second match
         # is necessary to handle @VAR@ substitutions.
-        if (match($1, /^@/) && !match($1, /@$/))
-                print
-        else {  
-                sub(/^\t[\t ]*/,"")
-                print "\t$(AM_V_GEN)" $0
-        }
+        if (!(match($1, /^@/) && !match($1, /.@$/)))
+                sub(/^\t[\t ]*/, "&$(AM_V_GEN)")
+        print
         cont = match($0, /\\$/)
         state = 2
         next
@@ -452,22 +460,32 @@ state == 1 && /^\t/ {
 # All non-continuation lines within the rule are prefixed
 # with $(AM_V_at).
 state == 2 && /^\t/ && NF > 0 {
-        if (!cont) {
-                sub(/^\t[\t ]*/,"")
-                print "\t$(AM_V_at)" $0
-        } else
-                print
+        if (!cont) 
+                sub(/^\t[\t ]*/, "&$(AM_V_at)")
+        print
         cont = match($0, /\\$/)
         next
 }
 # Everything else is output verbatim
-{ print }'
+{ print }
+'
 
 silent_rules=yes
 grep 'AM_SILENT_RULES' configure.ac > /dev/null ||
   grep '^[      ]*AM_INIT_AUTOMAKE([^)][^)]*silent-rules' configure.ac > /dev/null ||
   silent_rules=no
 
+silentize() {
+  if test "$silent_rules" = yes; then
+    case $1 in
+    *.am)  defn=0;;
+    *.in)  defn=1;;
+    esac
+    awk -v defn=$defn "$silent_rules_prog" $1 > ${1}-t &&
+    mv ${1}-t $1
+  fi
+}
+
 slurp() {
   for dir in . `(cd $1 && find * -type d -print)`; do
     copied=
@@ -489,10 +507,7 @@ slurp() {
           rm -f $dir/$gnulib_mk &&
           sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
         }
-        if test "$silent_rules" = yes; then
-          awk "$silent_rules_prog" $dir/$gnulib_mk > $dir/${gnulib_mk}-t &&
-          mv $dir/${gnulib_mk}-t $dir/${gnulib_mk}
-        fi
+        silentize $dir/$gnulib_mk
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
            version_controlled_file $dir $file; then
         echo "$0: $dir/$file overrides $1/$dir/$file"
@@ -651,7 +666,7 @@ if test $with_gettext = yes; then
           '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
   ' po/Makevars.template >po/Makevars
-
+  silentize po/Makefile.in.in
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
     rm -f runtime-po/Makevars