Cleanup: add silent rules support for docs

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 2258890f018b07c2fdbd8748f33f137ac817affd..52bd2688f37a468a69e0b9d037b44856000318ff 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -77,11 +77,16 @@ MAN = $(MAN1) $(MAN3) $(MAN8)
 CLEANFILES =
 
 if EMBED_HELP
 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 = \
 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' $@ ; \
        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
 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
 # 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
 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
 
 # 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)
        $(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)
 
 %.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)
 
 %.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)
 
 # 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 5a60c167914adc65a06d16e99ae997254879f308..315a995afdf512a26b448b7d2988a8f90e2fa692 100644 (file)
--- 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 = $(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
 
 
 AM_CPPFLAGS += -I$(srcdir) -g