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

[PATCH] Make asciidoc related rules depend on asciidoc.conf

From
Jonas Fonseca <fonseca@diku.dk>
Date
Jul 15, 2006, 07:44 UTC
Message-ID
<20060715074425.GA2661@diku.dk>
In-Reply-To
<7v3bd3ois4.fsf@assigned-by-dhcp.cox.net>

Any rule running asciidoc, whether using -f asciidoc.conf or not, will read asciidoc.conf. Make such rules depend on asciidoc.conf.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
Junio C Hamano <junkio@cox.net> wrote Fri, Jul 14, 2006:
> Alp is right -- the comments in [attributes] section after the
> definition do appear in the output, even with asciidoc 7.1.2, so
> here is a replacement proposal from me.

Am using the same setup as Alp (AsciiDoc 7.0.2 on Ubuntu Dapper), so I was a bit curious that I could not see that. So I guess I compiled the docs first and later decided to add the comments which then didn't cause a recompilation.

I don't know if there should be a dependency on asciidoc.conf in every rule calling asciidoc. Could be annoying if you are only making a minor change.

---
diff --git a/Documentation/Makefile b/Documentation/Makefile
index cc83610..ce6c6cf 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -76,18 +76,18 @@ README: ../README
 clean:
 	rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README
 
-%.html : %.txt
+%.html : %.txt asciidoc.conf
 	asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
 
 %.1 %.7 : %.xml
 	xmlto -m callouts.xsl man $<
 
-%.xml : %.txt
+%.xml : %.txt asciidoc.conf
 	asciidoc -b docbook -d manpage -f asciidoc.conf $<
 
 git.html: git.txt README
 
-glossary.html : glossary.txt sort_glossary.pl
+glossary.html : glossary.txt sort_glossary.pl asciidoc.conf
 	cat $< | \
 	perl sort_glossary.pl | \
 	asciidoc -b xhtml11 - > glossary.html
@@ -97,12 +97,12 @@ howto-index.txt: howto-index.sh $(wildca
 	sh ./howto-index.sh $(wildcard howto/*.txt) >$@+
 	mv $@+ $@
 
-$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
+$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt asciidoc.conf
 	asciidoc -b xhtml11 $*.txt
 
 WEBDOC_DEST = /pub/software/scm/git/docs
 
-$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt asciidoc.conf
 	rm -f $@+ $@
 	sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+
 	mv $@+ $@

-- 
Jonas Fonseca
Previous: Alp Toker
Message 12 of 12 in “Revert "Documentation: Fix ssh://[user@]host.xz URL"”
  1. Revert "Documentation: Fix ssh://[user@]host.xz URL"Alp Toker, Jul 14, 2006
  2. Documentation: Fix ssh:// URLs in generated documentationAlp Toker, Jul 14, 2006
  3. Documentation: Minor capitalization typofixAlp Toker, Jul 14, 2006
  4. Junio C HamanoJul 14, 2006
  5. urls.txt: Use substitution to escape square bracketsJonas Fonseca, Jul 14, 2006
  6. Junio C HamanoJul 14, 2006
  7. Alp TokerJul 14, 2006
  8. Junio C HamanoJul 14, 2006
  9. Alp TokerJul 14, 2006
  10. urls.txt: Use substitution to escape square bracketsJunio C Hamano, Jul 14, 2006
  11. Alp TokerJul 15, 2006
  12. Make asciidoc related rules depend on asciidoc.confJonas Fonseca, Jul 15, 2006

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.