Skip to content

Commit 12d078e

Browse files
felipecgitster
authored andcommitted
doc: refactor common asciidoc dependencies
Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent de88ac7 commit 12d078e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Documentation/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ ASCIIDOC_CONF = -f asciidoc.conf
139139
ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
140140
-amanversion=$(GIT_VERSION) \
141141
-amanmanual='Git Manual' -amansource='Git'
142+
ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
142143
TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
143144
TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
144145
MANPAGE_XSL = manpage-normal.xsl
@@ -354,12 +355,12 @@ clean:
354355
$(RM) manpage-base-url.xsl
355356
$(RM) GIT-ASCIIDOCFLAGS
356357

357-
$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
358+
$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
358359
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
359360
$(TXT_TO_HTML) -d manpage -o $@+ $< && \
360361
mv $@+ $@
361362

362-
$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
363+
$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
363364
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
364365
$(TXT_TO_HTML) -o $@+ $< && \
365366
mv $@+ $@
@@ -371,7 +372,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
371372
$(QUIET_XMLTO)$(RM) $@ && \
372373
$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
373374

374-
%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
375+
%.xml : %.txt $(ASCIIDOC_DEPS)
375376
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
376377
$(TXT_TO_XML) -d manpage -o $@+ $< && \
377378
mv $@+ $@

0 commit comments

Comments
 (0)