summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/Makefile
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-08-04 17:05:16 -0600
committerJonathan Corbet <corbet@lwn.net>2016-08-04 17:05:16 -0600
commit5f7b30cd766d3589a00750d6100f718347d8f495 (patch)
treed97cb6934284dc98def18ae7daaa819acc2d50ed /Documentation/DocBook/Makefile
parentc1ece76719205690f4b448460d9b85c130e8021b (diff)
parentbdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff)
downloadlwn-docs-next-merge.tar.gz
lwn-docs-next-merge.zip
Merge branch 'docs-next' into docs-next-mergedocs-next-merge
Fix the Makefile merge conflict.
Diffstat (limited to 'Documentation/DocBook/Makefile')
-rw-r--r--Documentation/DocBook/Makefile25
1 files changed, 12 insertions, 13 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index c481df33ef21..3e18762d61e8 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -6,8 +6,6 @@
# To add a new book the only step required is to add the book to the
# list of DOCBOOKS.
-ifeq ($(IGNORE_DOCBOOKS),)
-
DOCBOOKS := z8530book.xml device-drivers.xml \
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
writing_usb_driver.xml networking.xml \
@@ -19,6 +17,16 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
tracepoint.xml w1.xml \
writing_musb_glue_layer.xml crypto-API.xml iio.xml
+ifeq ($(DOCBOOKS),)
+
+# Skip DocBook build if the user explicitly requested no DOCBOOKS.
+.DEFAULT:
+ @echo " SKIP DocBook $@ target (DOCBOOKS=\"\" specified)."
+
+else
+
+include Documentation/DocBook/media/Makefile
+
###
# The build process is as follows (targets):
# (xmldocs) [by docproc]
@@ -214,16 +222,7 @@ silent_gen_xml = :
-e "s/>/\\&gt;/g"; \
echo "</programlisting>") > $@
-else
-
-htmldocs:
-pdfdocs:
-psdocs:
-xmldocs:
-installmandocs:
-
-endif # IGNORE_DOCBOOKS
-
+endif # DOCBOOKS=""
###
# Help targets as used by the top-level makefile
@@ -240,7 +239,7 @@ dochelp:
@echo ' make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
@echo ' valid values for DOCBOOKS are: $(DOCBOOKS)'
@echo
- @echo " make IGNORE_DOCBOOKS=1 [target] Don't generate docs from Docbook"
+ @echo " make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
@echo ' This is useful to generate only the ReST docs (Sphinx)'