on master help sign in
[fix] makefile.sphinx: additions to commit c2a6f145

In commit c2a6f145 the sphinx-doc and sphinx-live targets has been removed, since Sphinx is already installed by the pyenvinstall target. This commit removes the targets from the remaining prerequisites of the 'BOOK' targets Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commitaace837665aeb30ff1e9c2895ffc92465341b97a authorMarkus Heiser <markus.heiser@darmarit.de> dateThu 24 Dec 2020, 13:54 (6 years ago) parent2fc2d17
1 file changed+5−5
utils/makefile.sphinx+5−5
utils/makefile.sphinx+5−5
@@ -27,7 +27,7 @@ docs-help:
2727 @echo ' docs-clean - clean intermediate doc objects'
2828 @echo ' $(GH_PAGES) - create & upload github pages'
2929 @echo ' sphinx-pdf - run sphinx latex & pdf targets'
30− echo ''
30+ @echo ''
3131 @echo ' books/{name}.html : build only the HTML of document {name}'
3232 @echo ' valid values for books/{name}.html are:'
3333 @echo ' $(BOOKS_HTML)' | $(FMT)
@@ -99,7 +99,7 @@ sphinx-pdf: sphinx-latex
9999 @echo "SPHINX *.pdf --> file://$(abspath $(DOCS_DIST)/pdf)"
100100
101101PHONY += sphinx-latex
102−sphinx-latex: texlive sphinx-doc
102+sphinx-latex: pyenvinstall texlive
103103 $(SPHINXBUILD) $(SPHINX_VERBOSE) $(SPHINXOPTS)\
104104 -b latex \
105105 -c $(DOCS_FOLDER) \
@@ -124,7 +124,7 @@ $(BOOKS_DIST):
124124 mkdir -p $(BOOKS_DIST)
125125
126126PHONY += $(BOOKS_HTML)
127−$(BOOKS_HTML): sphinx-doc | $(BOOKS_DIST)
127+$(BOOKS_HTML): pyenvinstall | $(BOOKS_DIST)
128128 SPHINX_CONF=$(patsubst books/%.html,%,$@)/conf.py \
129129 $(SPHINXBUILD) $(SPHINX_VERBOSE) $(SPHINXOPTS)\
130130 -b html \
@@ -135,7 +135,7 @@ $(BOOKS_HTML): sphinx-doc | $(BOOKS_DIST)
135135 @echo "SPHINX $@ --> file://$(abspath $(BOOKS_DIST)/$(patsubst books/%.html,%,$@))"
136136
137137PHONY += $(BOOKS_HTML)
138−$(BOOKS_LIVE): sphinx-live | $(BOOKS_DIST)
138+$(BOOKS_LIVE): pyenvinstall | $(BOOKS_DIST)
139139 PATH="$(PY_ENV_BIN):$(PATH)" \
140140 SPHINX_CONF=$(patsubst books/%.live,%,$@)/conf.py \
141141 $(PY_ENV_BIN)/sphinx-autobuild --poll -B --host 0.0.0.0 --port 8080 $(SPHINX_VERBOSE) $(SPHINXOPTS)\
@@ -152,7 +152,7 @@ $(BOOKS_PDF): %.pdf : %.latex
152152 @echo "SPHINX $@ --> file://$(abspath $(BOOKS_DIST)/$(patsubst books/%.pdf,%,$@))/pdf"
153153
154154PHONY += $(BOOKS_LATEX)
155−$(BOOKS_LATEX): sphinx-doc | $(BOOKS_DIST)
155+$(BOOKS_LATEX): pyenvinstall | $(BOOKS_DIST)
156156 SPHINX_CONF=$(patsubst books/%.latex,%,$@)/conf.py \
157157 $(SPHINXBUILD) $(SPHINX_VERBOSE) $(SPHINXOPTS)\
158158 -b latex \