Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 01:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: more silent-rules.

Browse Source 
* doc/local.mk, src/local.mk, examples/calc++/Makefile.am: Use
	$(AM_V_GEN) and $(AM_V_at) where appropriate.
(cherry picked from commit f67c0a1c35)

Conflicts:

	doc/local.mk
	examples/calc++/Makefile.am
	src/local.mk
This commit is contained in:
Akim Demaille
2012-01-30 16:21:13 +01:00
parent e187b40d31
commit 0802356481
4 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@@ -32,15 +32,15 @@ EXTRA_DIST = .prev-version .version \
.PHONY: maintainer-check .PHONY: maintainer-check
maintainer-check: maintainer-check:
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ $(AM_V_GEN)cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
.PHONY: maintainer-push-check .PHONY: maintainer-push-check
maintainer-push-check: maintainer-push-check:
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ $(AM_V_GEN)cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
.PHONY: maintainer-xml-check .PHONY: maintainer-xml-check
maintainer-xml-check: maintainer-xml-check:
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ $(AM_V_GEN)cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
# See comments in build-aux/git-version-gen. However, we make .version depend # See comments in build-aux/git-version-gen. However, we make .version depend
# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the # on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
@@ -53,18 +53,18 @@ maintainer-xml-check:
# pass incorrectly. # pass incorrectly.
BUILT_SOURCES = $(top_srcdir)/.version BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version: configure $(top_srcdir)/.version: configure
echo $(VERSION) > $@-t && mv $@-t $@ $(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
dist-hook: gen-ChangeLog dist-hook: gen-ChangeLog
echo $(VERSION) > $(distdir)/.tarball-version $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
.PHONY: update-b4-copyright update-package-copyright-year .PHONY: update-b4-copyright update-package-copyright-year
update-b4-copyright: update-b4-copyright:
find data -type f \ $(AM_V_GEN)find data -type f \
| grep -v -E '^data/bison.m4$$' \ | grep -v -E '^data/bison.m4$$' \
| xargs $(build_aux)/$@ | xargs $(build_aux)/$@
@echo 'warning: src/parse-gram.[hc] may need to be regenerated.' @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
update-package-copyright-year: update-package-copyright-year:
$(build_aux)/$@ configure.ac $(AM_V_GEN)$(build_aux)/$@ configure.ac
gen_start_date = 2012-01-16 gen_start_date = 2012-01-16
.PHONY: gen-ChangeLog .PHONY: gen-ChangeLog

25
doc/Makefile.am
View File

@@ -26,13 +26,13 @@ clean-local:
CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
$(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL) $(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
mv -f $@ $@~ || : >$@~ $(AM_V_GEN)mv -f $@ $@~ || : >$@~
-rm -f $@.tmp $(AM_V_at)rm -f $@.tmp
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison $(AM_V_at)cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
$(top_builddir)/src/bison --help \ $(AM_V_at)$(top_builddir)/src/bison --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 $(AM_V_at)diff -u $@~ $@.tmp || true
mv $@.tmp $@ $(AM_V_at)mv $@.tmp $@
MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi
## ---------- ## ## ---------- ##
@@ -43,7 +43,7 @@ EXTRA_DIST = refcard.tex
CLEANFILES += refcard.dvi refcard.log refcard.ps CLEANFILES += refcard.dvi refcard.log refcard.ps
refcard.dvi: refcard.tex refcard.dvi: refcard.tex
tex refcard.tex $(AM_V_GEN)tex refcard.tex
refcard.ps: refcard.dvi refcard.ps: refcard.dvi
@@ -72,7 +72,7 @@ SUFFIXES = .x .1
PREPATH = $(top_builddir)/src PREPATH = $(top_builddir)/src
.x.1: .x.1:
@program=`expr "/$*" : '.*/\(.*\)'` && \ $(AM_V_GEN)program=`expr "/$*" : '.*/\(.*\)'` && \
save_IFS=$IFS; \ save_IFS=$IFS; \
IFS=$(PATH_SEPARATOR); \ IFS=$(PATH_SEPARATOR); \
for dir in $(PREPATH); do \ for dir in $(PREPATH); do \
@@ -80,20 +80,19 @@ PREPATH = $(top_builddir)/src
echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program && \ echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program && \
(cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \ (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \
done done
@echo "Updating man page $@" $(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \
PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \
export PATH; \ export PATH; \
$(HELP2MAN) \ $(HELP2MAN) \
--include=$*.x \ --include=$*.x \
--include=$(srcdir)/common.x \ --include=$(srcdir)/common.x \
--output=$@.t `echo '$*' | sed 's,.*/,,'` --output=$@.t `echo '$*' | sed 's,.*/,,'`
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 $@; \ touch $@; \
else \ else \
mv $@.t $@; \ mv $@.t $@; \
fi fi
rm -f $@*.t $(AM_V_at)rm -f $@*.t
nodist_man_MANS = yacc.1 nodist_man_MANS = yacc.1
@@ -120,6 +119,6 @@ CLEANFILES += Doxyfile
# Sed is used to generate Doxyfile from Doxyfile.in instead of # Sed is used to generate Doxyfile from Doxyfile.in instead of
# configure, because the former is way faster than the latter. # configure, because the former is way faster than the latter.
Doxyfile: $(srcdir)/Doxyfile.in Doxyfile: $(srcdir)/Doxyfile.in
$(edit) $(srcdir)/Doxyfile.in >Doxyfile $(AM_V_GEN)$(edit) $(srcdir)/Doxyfile.in >Doxyfile
CLEANDIRS += html latex CLEANDIRS += html latex

26
examples/calc++/Makefile.am
View File

@@ -22,7 +22,7 @@ BISON = $(top_builddir)/tests/bison
BISON_IN = $(top_srcdir)/tests/bison.in BISON_IN = $(top_srcdir)/tests/bison.in
$(BISON): $(BISON_IN) $(BISON): $(BISON_IN)
cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) bison $(AM_V_GEN)cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) bison
## ------------ ## ## ------------ ##
## Extracting. ## ## Extracting. ##
@@ -32,13 +32,13 @@ doc = $(top_srcdir)/doc/bison.texinfo
extexi = $(top_srcdir)/examples/extexi extexi = $(top_srcdir)/examples/extexi
# Extract in src. # Extract in src.
$(srcdir)/calc.stamp: $(doc) $(extexi) $(srcdir)/calc.stamp: $(doc) $(extexi)
rm -f $@ $@.tmp $(AM_V_GEN)rm -f $@ $@.tmp
touch $@.tmp $(AM_V_at)touch $@.tmp
cd $(srcdir) && \ $(AM_V_at)cd $(srcdir) && \
$(AWK) -f ../extexi -v VERSION="$(VERSION)" \ $(AWK) -f ../extexi -v VERSION="$(VERSION)" \
../../doc/bison.texinfo -- calc++-parser.yy \ ../../doc/bison.texinfo -- calc++-parser.yy \
calc++-scanner.ll calc++.cc calc++-driver.hh calc++-driver.cc 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
@@ -61,14 +61,14 @@ EXTRA_DIST = \
# Don't depend on $(BISON) otherwise we would rebuild these files # Don't depend on $(BISON) otherwise we would rebuild these files
# in srcdir, including during distcheck, which is forbidden. # in srcdir, including during distcheck, which is forbidden.
$(srcdir)/calc++-parser.stamp: $(srcdir)/calc++-parser.yy $(BISON_IN) $(srcdir)/calc++-parser.stamp: $(srcdir)/calc++-parser.yy $(BISON_IN)
@rm -f calc++-parser.tmp $(AM_V_GEN)rm -f calc++-parser.tmp
@touch calc++-parser.tmp $(AM_V_at)touch calc++-parser.tmp
$(BISON) -d -ra -S lalr1.cc -o $(srcdir)/calc++-parser.cc \ $(AM_V_at)$(BISON) -d -ra -S lalr1.cc -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 && \ rm -f $(srcdir)/calc++-parser.stamp && \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp; \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp; \
fi fi
@@ -81,11 +81,11 @@ $(calc_sources_generated): $(srcdir)/calc++-parser.stamp
check_PROGRAMS = calc++ check_PROGRAMS = calc++
calc_sources_extracted = $(srcdir)/calc++-scanner.ll $(srcdir)/calc++.cc \ 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_extracted = $(calc_sources_extracted) $(srcdir)/calc++-parser.yy
calc_sources_generated = \ calc_sources_generated = \
$(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \ $(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \
$(srcdir)/calc++-parser.hh $(srcdir)/calc++-parser.cc $(srcdir)/calc++-parser.hh $(srcdir)/calc++-parser.cc
calc___SOURCES = $(calc_sources_extracted) $(calc_sources_generated) calc___SOURCES = $(calc_sources_extracted) $(calc_sources_generated)

6
src/Makefile.am
View File

@@ -80,9 +80,9 @@ scan-gram.c
MOSTLYCLEANFILES = yacc MOSTLYCLEANFILES = yacc
yacc: yacc:
echo '#! /bin/sh' >$@ $(AM_V_GEN)echo '#! /bin/sh' >$@
echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
chmod a+x $@ $(AM_V_at)chmod a+x $@
echo: echo:
echo $(bison_SOURCES) $(noinst_HEADERS) echo $(bison_SOURCES) $(noinst_HEADERS)