Thread (18 messages) 18 messages, 4 authors, 2021-05-13
STALE1852d

[PATCH 8/8] doc: join xml and man rules

From: Felipe Contreras <hidden>
Date: 2021-05-12 23:27:55
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

Will be useful later with asciidoctor that can do both at the same time.

Signed-off-by: Felipe Contreras <redacted>
---
 Documentation/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index ba0c947d0d..d5ea05295d 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -367,11 +367,9 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
 manpage-base-url.xsl: manpage-base-url.xsl.in
 	$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
 
-%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
-	$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
-
-%.xml : %.txt $(ASCIIDOC_DEPS)
-	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
+%.1 %.5 %.7 : %.txt $(ASCIIDOC_DEPS) manpage-base-url.xsl $(wildcard manpage*.xsl)
+	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $*.xml $< && \
+	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $*.xml
 
 user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
 	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<
-- 
2.31.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help