Documentation: refactor common operations into variables
The Makefile performs several very similar tasks to convert AsciiDoc files into either HTML or DocBook. Move these items into variables to reduce the duplication. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Oct 27, 2014 at 00:13 UTC
da8a3664b133926435e4de1c1d6a9008dd5b741b
1 file changed
+11
-11
Documentation/Makefile
+11
-11
@@ -100,6 +100,10 @@ ASCIIDOC_EXTRA =
100
ASCIIDOC_HTML = xhtml11
101
ASCIIDOC_DOCBOOK = docbook
102
ASCIIDOC_CONF = -f asciidoc.conf
103
+ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
104
+ -agit-version=$(GIT_VERSION)
105
+TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
106
+TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
107
MANPAGE_XSL = manpage-normal.xsl
108
XMLTO = xmlto
109
XMLTO_EXTRA =
@@ -307,14 +311,12 @@ clean:
311
312
$(MAN_HTML): %.html : %.txt asciidoc.conf
313
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
310
- $(ASCIIDOC) -b $(ASCIIDOC_HTML) -d manpage $(ASCIIDOC_CONF) \
311
- $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
314
+ $(TXT_TO_HTML) -d manpage -o $@+ $< && \
315
mv $@+ $@
316
317
$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
318
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
316
- $(ASCIIDOC) -b $(ASCIIDOC_HTML) $(ASCIIDOC_CONF) \
317
- $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
319
+ $(TXT_TO_HTML) -o $@+ $< && \
320
mv $@+ $@
321
322
manpage-base-url.xsl: manpage-base-url.xsl.in
@@ -326,13 +328,12 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
328
329
%.xml : %.txt asciidoc.conf
330
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
329
- $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
330
- $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
331
+ $(TXT_TO_XML) -d manpage -o $@+ $< && \
332
mv $@+ $@
333
334
user-manual.xml: user-manual.txt user-manual.conf
335
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
335
- $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b $(ASCIIDOC_DOCBOOK) -d article -o $@+ $< && \
336
+ $(TXT_TO_XML) -d article -o $@+ $< && \
337
mv $@+ $@
338
339
technical/api-index.txt: technical/api-index-skel.txt \
@@ -341,8 +342,7 @@ technical/api-index.txt: technical/api-index-skel.txt \
342
343
technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
344
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
344
- $(QUIET_ASCIIDOC)$(ASCIIDOC) -b $(ASCIIDOC_HTML) $(ASCIIDOC_CONF) \
345
- $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt
345
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
346
347
XSLT = docbook.xsl
348
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
@@ -389,7 +389,7 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
389
mv $@+ $@
390
391
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
392
- $(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b $(ASCIIDOC_HTML) $*.txt
392
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
393
394
WEBDOC_DEST = /pub/software/scm/git/docs
395
@@ -397,7 +397,7 @@ howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
397
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
398
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
399
sed -e '1,/^$$/d' $< | \
400
- $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b $(ASCIIDOC_HTML) - >$@+ && \
400
+ $(TXT_TO_HTML) - >$@+ && \
401
mv $@+ $@
402
403
install-webdoc : html