From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 27 Apr 2021 15:00:41 +0000 (-0400)
Subject: doc: xmlto output to stdout on a verbose build
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d8e38296bca199c1ae24269b86ed069b62f56aa6;p=lttng-ust.git

doc: xmlto output to stdout on a verbose build

When running 'make V=1' send the output of xmlto to stdout to help with
debugging command failures.

Change-Id: Ia974bb0ca9671129499b7966e8790a594ce034b2
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index aed7835a..dfc319a4 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -61,6 +61,10 @@ xmlto_verbose = $(xmlto_verbose_@AM_V@)
 xmlto_verbose_ = $(xmlto_verbose_@AM_DEFAULT_V@)
 xmlto_verbose_0 = @echo "  XMLTO     " $@;
 
+xmlto_verbose_out = $(xmlto_verbose_out_@AM_V@)
+xmlto_verbose_out_ = $(xmlto_verbose_out_@AM_DEFAULT_V@)
+xmlto_verbose_out_0 = 2>/dev/null
+
 # Tools to execute:
 ADOC = $(asciidoc_verbose)$(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \
 	-a mansource="LTTng" \
@@ -75,7 +79,7 @@ XTO = $(xmlto_verbose)$(XMLTO) -m $(XSL_FILE) man
 	$(ADOC_DOCBOOK) -o $@ $<
 
 %.1: %.1.xml $(XSL_FILE)
-	$(XTO) $< 2>/dev/null
+	$(XTO) $< $(xmlto_verbose_out)
 
 %.3.xml: $(srcdir)/%.3.txt $(COMMON_DEPS)
 	$(ADOC_DOCBOOK) -o $@ $<
@@ -92,13 +96,13 @@ tracelog.3 vtracelog.3: tracelog.3.alias
 .INTERMEDIATE: tracef.3.alias tracelog.3.alias
 
 tracef.3.alias: tracef.3.xml $(XSL_FILE)
-	$(XTO) $< 2>/dev/null
+	$(XTO) $< $(xmlto_verbose_out)
 
 tracelog.3.alias: tracelog.3.xml $(XSL_FILE)
-	$(XTO) $< 2>/dev/null
+	$(XTO) $< $(xmlto_verbose_out)
 
 %.3: %.3.xml $(XSL_FILE)
-	$(XTO) $< 2>/dev/null
+	$(XTO) $< $(xmlto_verbose_out)
 
 # Only clean the generated files if we have the tools to generate them again.
 CLEANFILES = $(MAN_XML) $(MAN)