From f83a87aeb06973a4ab6c6770021d7d199962e6b1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 12 May 2017 15:30:09 -0400 Subject: [PATCH] Cleanup: add silent rules support for docs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- doc/man/Makefile.am | 24 +++++++++++++++++++----- tests/regression/ust/ust-dl/Makefile.am | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 2258890f0..52bd2688f 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -77,11 +77,16 @@ MAN = $(MAN1) $(MAN3) $(MAN8) CLEANFILES = if EMBED_HELP +mantoh_verbose = $(mantoh_verbose_@AM_V@) +mantoh_verbose_ = $(mantoh_verbose_@AM_DEFAULT_V@) +mantoh_verbose_0 = @echo " MANTOH " $@; + MAN1_H = $(addsuffix .1.h,$(MAN1_NAMES)) MAN3_H = $(addsuffix .3.h,$(MAN3_NAMES)) MAN8_H = $(addsuffix .8.h,$(MAN8_NAMES)) MAN_H = $(MAN1_H) $(MAN3_H) $(MAN8_H) MAN_H_RECIPE = \ + $(mantoh_verbose_0)\ MANWIDTH=80 @MANPROG@ --encoding=UTF-8 --no-hyphenation --no-justification --local-file $< > $@ ; \ $(SED) -i 's/\\/\\\\/g' $@ ; \ $(SED) -i 's/"/\\"/g' $@ ; \ @@ -104,10 +109,19 @@ endif # EMBED_HELP if MAN_PAGES_OPT # at this point, we know the user asked to build the man pages if HAVE_ASCIIDOC_XMLTO + +asciidoc_verbose = $(asciidoc_verbose_@AM_V@) +asciidoc_verbose_ = $(asciidoc_verbose_@AM_DEFAULT_V@) +asciidoc_verbose_0 = @echo " ASCIIDOC " $@; + +xmlto_verbose = $(xmlto_verbose_@AM_V@) +xmlto_verbose_ = $(xmlto_verbose_@AM_DEFAULT_V@) +xmlto_verbose_0 = @echo " XMLTO " $@; + # tools -ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -f $(ASCIIDOC_ATTRS_CONF) -d manpage +ADOC = $(asciidoc_verbose)$(ASCIIDOC) -f $(ASCIIDOC_CONF) -f $(ASCIIDOC_ATTRS_CONF) -d manpage ADOC_DOCBOOK = $(ADOC) -b docbook -XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man +XTO = $(xmlto_verbose)$(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man # only add this dependency if we can build the man pages because it's # a file generated by the configure script, so it's more recent than @@ -119,19 +133,19 @@ COMMON_DEPS += $(ASCIIDOC_ATTRS_CONF) $(ADOC_DOCBOOK) -o $@ $< %.1: %.1.xml $(XSL_SRC_FILES) - $(XTO) $< + $(XTO) $< 2>/dev/null %.3.xml: $(srcdir)/%.3.txt $(COMMON_DEPS) $(ADOC_DOCBOOK) -o $@ $< %.3: %.3.xml $(XSL_SRC_FILES) - $(XTO) $< + $(XTO) $< 2>/dev/null %.8.xml: $(srcdir)/%.8.txt $(COMMON_DEPS) $(ADOC_DOCBOOK) -o $@ $< %.8: %.8.xml $(XSL_SRC_FILES) - $(XTO) $< + $(XTO) $< 2>/dev/null # only clean the generated files if we have the tools to generate them again CLEANFILES += $(MAN_XML) $(MAN) diff --git a/tests/regression/ust/ust-dl/Makefile.am b/tests/regression/ust/ust-dl/Makefile.am index 5a60c1679..315a995af 100644 --- a/tests/regression/ust/ust-dl/Makefile.am +++ b/tests/regression/ust/ust-dl/Makefile.am @@ -13,7 +13,7 @@ else objcopy_verbose = $(objcopy_verbose_@AM_V@) objcopy_verbose_ = $(objcopy_verbose_@AM_DEFAULT_V@) -objcopy_verbose_0 = @echo OBJCOPY $@; +objcopy_verbose_0 = @echo " OBJCOPY " $@; AM_CPPFLAGS += -I$(srcdir) -g -- 2.34.1