diff options
| author | Keith Packard <keithp@keithp.com> | 2015-11-13 23:17:11 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-11-13 23:17:11 -0800 |
| commit | 688c5ee98565a25e77c8618e1957ed3b8eff5a56 (patch) | |
| tree | 81b50d6d96b20fb8b39031448d5de0181185feae /doc | |
| parent | 992c0eab6275cec7d5035b99952537fd7ece2ed4 (diff) | |
doc: Try a different trick for asciidoc build issues
asciidoc creates temp files in the current directory using basename of
the source filename. Doing html and pdf builds in parallel causes
chaos as a result. Fix this by having the pdf target build both
serially, and then have the html target just depend on the pdf target.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/Makefile b/doc/Makefile index 7a4e0fa3..b0c09ffe 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -230,25 +230,24 @@ DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET) sed -e 's/^[ ]*//' -e 's/^\\//' $*.inc > $@ .raw.pdf: - a2x --verbose -a icons -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw + a2x --verbose -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw + a2x --verbose -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw -.raw.html: - a2x --verbose -a icons -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw +.pdf.html: + @touch $@ .tmpl.xsl: xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl all: $(HTML) $(PDF) -$(HTML): $(PDF) - altusmetrum-revhistory.html: altusmetrum.html micropeak-revhistory.html: micropeak.html telegps-revhistory.html: telegps.html -altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(RAW_INC) $(IMAGES) +altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(IMAGES) telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_RAW_FILES) $(IMAGES) |