maint: more silent-rules.

	* doc/local.mk, src/local.mk, examples/calc++/Makefile.am: Use
	$(AM_V_GEN) and $(AM_V_at) where appropriate.

diff --git a/doc/local.mk b/doc/local.mk
index aa3c914702716d244ecbf765eee2b9d29dfacd9b..09c387a7d61df55bce3005ff31e9169d022b5c14 100644 (file)
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -33,12 +33,12 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
 # Create $@~ which is the previous contents.  Don't use `mv' here so
 # that even if we are interrupted, the file is still available for
 # diff in the next run.  Note that $@ might not exist yet.
 # Create $@~ which is the previous contents.  Don't use `mv' here so
 # that even if we are interrupted, the file is still available for
 # diff in the next run.  Note that $@ might not exist yet.

-       { test ! -f $@ || cat $@; } >$@~
-       test ! -f $@.tmp || rm -f $@.tmp
-       src/bison$(EXEEXT) --help |                                      \
+       $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
+       $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
+       $(AM_V_at)src/bison$(EXEEXT) --help |                            \

          perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
          perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp

-       diff -u $@~ $@.tmp || true
-       mv $@.tmp $@
+       $(AM_V_at)diff -u $@~ $@.tmp || true
+       $(AM_V_at)mv $@.tmp $@

 MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
 
 ## ---------- ##
 MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
 
 ## ---------- ##


@@ -49,7 +49,7 @@ EXTRA_DIST += doc/refcard.tex
 CLEANFILES += doc/refcard.dvi doc/refcard.log doc/refcard.ps
 
 doc/refcard.dvi: doc/refcard.tex
 CLEANFILES += doc/refcard.dvi doc/refcard.log doc/refcard.ps
 
 doc/refcard.dvi: doc/refcard.tex

-       cd doc && tex refcard.tex
+       $(AM_V_GEN)cd doc && tex refcard.tex

 
 doc/refcard.ps: doc/refcard.dvi
 
 
 doc/refcard.ps: doc/refcard.dvi
 


@@ -80,9 +80,9 @@ doc/refcard.ps: doc/refcard.dvi
 EXTRA_DIST += $(top_srcdir)/doc/bison.help
 MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
 $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
 EXTRA_DIST += $(top_srcdir)/doc/bison.help
 MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
 $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)

-       $< --version >doc/bison.help.t
-       $< --help   >>doc/bison.help.t
-       $(top_srcdir)/build-aux/move-if-change doc/bison.help.t $@
+       $(AM_V_GEN)$< --version >doc/bison.help.t
+       $(AM_V_at)$< --help   >>doc/bison.help.t
+       $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.t $@

 
 
 ## ----------- ##
 
 
 ## ----------- ##


@@ -100,17 +100,16 @@ remove_time_stamp = \
 
 # Depend on configure to get version number changes.
 $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
 
 # Depend on configure to get version number changes.
 $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure

-       @echo "Updating man page $@"
-       $(HELP2MAN)                                     \
-           --include=$(top_srcdir)/doc/bison.x         \
+       $(AM_V_GEN)$(HELP2MAN)                  \
+           --include=$(top_srcdir)/doc/bison.x \

            --output=$@.t src/bison$(EXEEXT)
            --output=$@.t src/bison$(EXEEXT)

-       if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&                 \
+       $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&       \

           $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
           $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \

-         touch $@;                                                      \
-       else                                                             \
-         mv $@.t $@;                                                    \
+         touch $@;                                                      \
+       else                                                             \
+         mv $@.t $@;                                                    \

        fi
        fi

-       rm -f $@*.t
+       $(AM_V_at)rm -f $@*.t

 
 nodist_man_MANS = doc/yacc.1
 
 
 nodist_man_MANS = doc/yacc.1
 


@@ -125,7 +124,7 @@ DOXYGEN = doxygen
 doc: html
 
 html-local: doc/Doxyfile
 doc: html
 
 html-local: doc/Doxyfile

-       cd doc && $(DOXYGEN)
+       $(AM_V_GEN) cd doc && $(DOXYGEN)

 
 edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 
 edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \


@@ -137,6 +136,6 @@ CLEANFILES += doc/Doxyfile
 # Sed is used to generate Doxyfile from Doxyfile.in instead of
 # configure, because the former is way faster than the latter.
 doc/Doxyfile: $(top_srcdir)/doc/Doxyfile.in
 # Sed is used to generate Doxyfile from Doxyfile.in instead of
 # configure, because the former is way faster than the latter.
 doc/Doxyfile: $(top_srcdir)/doc/Doxyfile.in

-       $(edit) $(top_srcdir)/doc/Doxyfile.in >doc/Doxyfile
+       $(AM_V_GEN) $(edit) $(top_srcdir)/doc/Doxyfile.in >doc/Doxyfile

 
 CLEANDIRS += html latex
 
 CLEANDIRS += html latex

diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
index b0373440b986fbe5d8d9ea057ec1bd2e57c07edb..9120d7546f62c3408c32eda47f8ada7dd6d501c2 100644 (file)
--- a/examples/calc++/Makefile.am
+++ b/examples/calc++/Makefile.am
@@ -23,7 +23,7 @@ BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in
 
 $(BISON): $(BISON_IN)
 BISON_IN = $(top_srcdir)/tests/bison.in
 
 $(BISON): $(BISON_IN)

-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) tests/bison
+       $(AM_V_GEN)cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) tests/bison

 
 ## ------------ ##
 ## Extracting.  ##
 
 ## ------------ ##
 ## Extracting.  ##


@@ -33,13 +33,13 @@ doc = $(top_srcdir)/doc/bison.texinfo
 extexi = $(top_srcdir)/examples/extexi
 # Extract in src.
 $(srcdir)/calc.stamp: $(doc) $(extexi)
 extexi = $(top_srcdir)/examples/extexi
 # Extract in src.
 $(srcdir)/calc.stamp: $(doc) $(extexi)

-       rm -f $@ $@.tmp
-       touch $@.tmp
-       cd $(srcdir) && \
+       $(AM_V_GEN)rm -f $@ $@.tmp
+       $(AM_V_at)touch $@.tmp
+       $(AM_V_at)cd $(srcdir) && \

           $(AWK) -f ../extexi -v VERSION="$(VERSION)" \
             ../../doc/bison.texinfo -- calc++-parser.yy \
             calc++-scanner.ll calc++.cc calc++-driver.hh calc++-driver.cc
           $(AWK) -f ../extexi -v VERSION="$(VERSION)" \
             ../../doc/bison.texinfo -- calc++-parser.yy \
             calc++-scanner.ll calc++.cc calc++-driver.hh calc++-driver.cc

-       mv $@.tmp $@
+       $(AM_V_at)mv $@.tmp $@

 
 $(calc_extracted): $(srcdir)/calc.stamp
 
 
 $(calc_extracted): $(srcdir)/calc.stamp
 


@@ -62,14 +62,14 @@ EXTRA_DIST =                                    \
 # Don't depend on $(BISON) otherwise we would rebuild these files
 # in srcdir, including during distcheck, which is forbidden.
 $(srcdir)/calc++-parser.stamp: $(srcdir)/calc++-parser.yy $(BISON_IN)
 # Don't depend on $(BISON) otherwise we would rebuild these files
 # in srcdir, including during distcheck, which is forbidden.
 $(srcdir)/calc++-parser.stamp: $(srcdir)/calc++-parser.yy $(BISON_IN)

-       @rm -f calc++-parser.tmp
-       @touch calc++-parser.tmp
-       $(BISON) -d -ra -o $(srcdir)/calc++-parser.cc \
+       $(AM_V_GEN)rm -f calc++-parser.tmp
+       $(AM_V_at)touch calc++-parser.tmp
+       $(AM_V_at)$(BISON) -d -ra -o $(srcdir)/calc++-parser.cc \

          $(srcdir)/calc++-parser.yy
          $(srcdir)/calc++-parser.yy

-       @mv -f calc++-parser.tmp $@
+       $(AM_V_at)mv -f calc++-parser.tmp $@

 
 $(calc_sources_generated): $(srcdir)/calc++-parser.stamp
 
 $(calc_sources_generated): $(srcdir)/calc++-parser.stamp

-       @if test -f $@; then :; else \
+       $(AM_V_GEN)if test -f $@; then :; else \

          rm -f $(srcdir)/calc++-parser.stamp && \
          $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp; \
        fi
          rm -f $(srcdir)/calc++-parser.stamp && \
          $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp; \
        fi


@@ -82,11 +82,11 @@ $(calc_sources_generated): $(srcdir)/calc++-parser.stamp
 check_PROGRAMS = calc++
 
 calc_sources_extracted = $(srcdir)/calc++-scanner.ll $(srcdir)/calc++.cc \
 check_PROGRAMS = calc++
 
 calc_sources_extracted = $(srcdir)/calc++-scanner.ll $(srcdir)/calc++.cc \

-       $(srcdir)/calc++-driver.hh $(srcdir)/calc++-driver.cc
+  $(srcdir)/calc++-driver.hh $(srcdir)/calc++-driver.cc

 calc_extracted = $(calc_sources_extracted) $(srcdir)/calc++-parser.yy
 calc_sources_generated = \
 calc_extracted = $(calc_sources_extracted) $(srcdir)/calc++-parser.yy
 calc_sources_generated = \

-       $(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \
-       $(srcdir)/calc++-parser.hh $(srcdir)/calc++-parser.cc
+  $(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \
+  $(srcdir)/calc++-parser.hh $(srcdir)/calc++-parser.cc

 
 calc___SOURCES = $(calc_sources_extracted) $(calc_sources_generated)
 
 
 calc___SOURCES = $(calc_sources_extracted) $(calc_sources_generated)
 

diff --git a/src/local.mk b/src/local.mk
index 6d8bc2dd6eefe87b07eccf46b962c4c588894884..36c0ac7d47ae9dcbb6f0a698d4f0459b94d54bc5 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -122,8 +122,8 @@ BUILT_SOURCES +=                                \
 MOSTLYCLEANFILES += src/yacc
 
 src/yacc:
 MOSTLYCLEANFILES += src/yacc
 
 src/yacc:

-       rm -f $@ $@.tmp
-       echo '#! /bin/sh' >$@.tmp
-       echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp
-       chmod a+x $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)rm -f $@ $@.tmp
+       $(AM_V_at)echo '#! /bin/sh' >$@.tmp
+       $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp
+       $(AM_V_at)chmod a+x $@.tmp
+       $(AM_V_at)mv $@.tmp $@