Skip to content

Commit bdf107d

Browse files
jnikulaJonathan Corbet
authored andcommitted
DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
Instead of a separate ignore flag, use the obvious DOCBOOKS="" to ignore all DocBook files. This is also in line with the Sphinx build being ignored if a non-empty DOCBOOKS make variable is specified on the make command line. This replaces the IGNORE_DOCBOOKS introduced in commit 5472188 Author: Mauro Carvalho Chehab <[email protected]> Date: Sat Jul 9 13:12:45 2016 -0300 doc-rst: add an option to ignore DocBooks when generating docs and aligns with commit 6387872 Author: Jani Nikula <[email protected]> Date: Fri Jul 1 15:24:44 2016 +0300 Documentation/sphinx: skip build if user requested specific DOCBOOKS Cc: Daniel Vetter <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Tested-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Jonathan Corbet <[email protected]>
1 parent 09c3bcc commit bdf107d

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

Documentation/DocBook/Makefile

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
# To add a new book the only step required is to add the book to the
77
# list of DOCBOOKS.
88

9-
ifeq ($(IGNORE_DOCBOOKS),)
10-
119
DOCBOOKS := z8530book.xml device-drivers.xml \
1210
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
1311
writing_usb_driver.xml networking.xml \
@@ -19,6 +17,14 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
1917
tracepoint.xml gpu.xml media_api.xml w1.xml \
2018
writing_musb_glue_layer.xml crypto-API.xml iio.xml
2119

20+
ifeq ($(DOCBOOKS),)
21+
22+
# Skip DocBook build if the user explicitly requested no DOCBOOKS.
23+
.DEFAULT:
24+
@echo " SKIP DocBook $@ target (DOCBOOKS=\"\" specified)."
25+
26+
else
27+
2228
include Documentation/DocBook/media/Makefile
2329

2430
###
@@ -217,19 +223,7 @@ silent_gen_xml = :
217223
-e "s/>/\\&gt;/g"; \
218224
echo "</programlisting>") > $@
219225

220-
else
221-
222-
# Needed, due to cleanmediadocs
223-
include Documentation/DocBook/media/Makefile
224-
225-
htmldocs:
226-
pdfdocs:
227-
psdocs:
228-
xmldocs:
229-
installmandocs:
230-
231-
endif # IGNORE_DOCBOOKS
232-
226+
endif # DOCBOOKS=""
233227

234228
###
235229
# Help targets as used by the top-level makefile
@@ -246,7 +240,7 @@ dochelp:
246240
@echo ' make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
247241
@echo ' valid values for DOCBOOKS are: $(DOCBOOKS)'
248242
@echo
249-
@echo " make IGNORE_DOCBOOKS=1 [target] Don't generate docs from Docbook"
243+
@echo " make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
250244
@echo ' This is useful to generate only the ReST docs (Sphinx)'
251245

252246

0 commit comments

Comments
 (0)