git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 2/3] Documentation/Makefile: add missing dependency on asciidoctor-extensions

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 11, 2019, 09:26 UTC
Message-ID
<20190311092605.259322-2-gitster@pobox.com>
In-Reply-To
<20190311092605.259322-1-gitster@pobox.com>
From: Martin Ågren <martin.agren@gmail.com>

asciidoctor-extensions.rb has never changed, but when it does -- such as in the next commit --, it helps if the xml-files depend on it. We're casting the net a bit too wide here, since we'll be rebuilding even with AsciiDoc, which won't look at this file. But since this file changes so rarely, that should be ok. It's better than missing a dependency.

Similarly, most of the html-files are produced directly from ".txt'; make the html-files too depend on asciidoctor-extensions.rb, both the HTMLified manual pages as well as the user-manual that does use .xml intermediary.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index ea6b8e5d72..f58904a929 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -334,12 +334,12 @@ clean:
 	$(RM) $(cmds_txt) $(mergetools_txt) *.made
 	$(RM) manpage-base-url.xsl
 
-$(MAN_HTML): %.html : %.txt asciidoc.conf
+$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
 	$(TXT_TO_HTML) -d manpage -o $@+ $< && \
 	mv $@+ $@
 
-$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
+$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
 	$(TXT_TO_HTML) -o $@+ $< && \
 	mv $@+ $@
@@ -351,12 +351,12 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
 	$(QUIET_XMLTO)$(RM) $@ && \
 	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
-%.xml : %.txt asciidoc.conf
+%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
 	$(TXT_TO_XML) -d manpage -o $@+ $< && \
 	mv $@+ $@
 
-user-manual.xml: user-manual.txt user-manual.conf
+user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
 	$(TXT_TO_XML) -d book -o $@+ $< && \
 	mv $@+ $@
-- 
2.21.0-155-ge902e9bcae
Previous: Junio C HamanoNext: Junio C Hamano
Message 29 of 31 in “asciidoctor-extensions: fix spurious space after linkgit”
  1. 0/3 asciidoctor-extensions: fix spurious space after linkgitMartin Ågren, Feb 25, 2019
  2. 1/3 Documentation/Makefile: add missing xsl dependencies for manpagesMartin Ågren, Feb 25, 2019
  3. Eric SunshineFeb 25, 2019
  4. Martin ÅgrenFeb 25, 2019
  5. Eric SunshineFeb 25, 2019
  6. Martin ÅgrenFeb 26, 2019
  7. Eric SunshineFeb 26, 2019
  8. Martin ÅgrenFeb 27, 2019
  9. 2/3 Documentation/Makefile: add missing dependency on asciidoctor-extensionsMartin Ågren, Feb 25, 2019
  10. 3/3 asciidoctor-extensions: fix spurious space after linkgitMartin Ågren, Feb 25, 2019
  11. brian m. carlsonFeb 26, 2019
  12. brian m. carlsonFeb 26, 2019
  13. Martin ÅgrenFeb 26, 2019
  14. 0/3 asciidoctor-extensions: fix spurious space after linkgitMartin Ågren, Feb 27, 2019
  15. 1/3 Documentation/Makefile: add missing xsl dependencies for manpagesMartin Ågren, Feb 27, 2019
  16. 2/3 Documentation/Makefile: add missing dependency on asciidoctor-extensionsMartin Ågren, Feb 27, 2019
  17. 3/3 asciidoctor-extensions: fix spurious space after linkgitMartin Ågren, Feb 27, 2019
  18. brian m. carlsonFeb 28, 2019
  19. Junio C HamanoMar 3, 2019
  20. 0/2 fix spurious space after linkgit, now in *.htmlMartin Ågren, Mar 10, 2019
  21. 1/2 Documentation/Makefile: add missing dependencies on asciidoctor-extensionsMartin Ågren, Mar 10, 2019
  22. 2/2 asciidoctor-extensions: fix spurious space after linkgit in *.htmlMartin Ågren, Mar 10, 2019
  23. Jeff KingMar 11, 2019
  24. Martin ÅgrenMar 11, 2019
  25. Junio C HamanoMar 11, 2019
  26. Martin ÅgrenMar 11, 2019
  27. Junio C HamanoMar 11, 2019
  28. 1/3 Documentation/Makefile: add missing xsl dependencies for manpagesJunio C Hamano, Mar 11, 2019
  29. 2/3 Documentation/Makefile: add missing dependency on asciidoctor-extensionsJunio C Hamano, Mar 11, 2019
  30. 3/3 asciidoctor-extensions: fix spurious space after linkgitJunio C Hamano, Mar 11, 2019
  31. Martin ÅgrenMar 11, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.