projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux
[platform/kernel/linux-rpi.git]
/
Documentation
/
DocBook
/
Makefile
diff --git
a/Documentation/DocBook/Makefile
b/Documentation/DocBook/Makefile
index
01bab50
..
64460a8
100644
(file)
--- 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.
# 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 \
DOCBOOKS := z8530book.xml device-drivers.xml \
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
writing_usb_driver.xml networking.xml \
@@
-16,10
+14,16
@@
DOCBOOKS := z8530book.xml device-drivers.xml \
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
80211.xml debugobjects.xml sh.xml regulator.xml \
alsa-driver-api.xml writing-an-alsa-driver.xml \
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
80211.xml debugobjects.xml sh.xml regulator.xml \
alsa-driver-api.xml writing-an-alsa-driver.xml \
- tracepoint.xml
gpu.xml media_api.xml
w1.xml \
+ tracepoint.xml w1.xml \
writing_musb_glue_layer.xml crypto-API.xml iio.xml
writing_musb_glue_layer.xml crypto-API.xml iio.xml
-include Documentation/DocBook/media/Makefile
+ifeq ($(DOCBOOKS),)
+
+# Skip DocBook build if the user explicitly requested no DOCBOOKS.
+.DEFAULT:
+ @echo " SKIP DocBook $@ target (DOCBOOKS=\"\" specified)."
+
+else
###
# The build process is as follows (targets):
###
# The build process is as follows (targets):
@@
-49,7
+53,6
@@
pdfdocs: $(PDF)
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
htmldocs: $(HTML)
$(call cmd,build_main_index)
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
htmldocs: $(HTML)
$(call cmd,build_main_index)
- $(call install_media_images)
MAN := $(patsubst %.xml, %.9, $(BOOKS))
mandocs: $(MAN)
MAN := $(patsubst %.xml, %.9, $(BOOKS))
mandocs: $(MAN)
@@
-217,19
+220,7
@@
silent_gen_xml = :
-e "s/>/\\>/g"; \
echo "</programlisting>") > $@
-e "s/>/\\>/g"; \
echo "</programlisting>") > $@
-else
-
-# Needed, due to cleanmediadocs
-include Documentation/DocBook/media/Makefile
-
-htmldocs:
-pdfdocs:
-psdocs:
-xmldocs:
-installmandocs:
-
-endif # IGNORE_DOCBOOKS
-
+endif # DOCBOOKS=""
###
# Help targets as used by the top-level makefile
###
# Help targets as used by the top-level makefile
@@
-246,7
+237,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 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)'
@echo ' This is useful to generate only the ReST docs (Sphinx)'
@@
-269,7
+260,7
@@
clean-files := $(DOCBOOKS) \
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
-cleandocs:
cleanmediadocs
+cleandocs:
$(Q)rm -f $(call objectify, $(clean-files))
$(Q)rm -rf $(call objectify, $(clean-dirs))
$(Q)rm -f $(call objectify, $(clean-files))
$(Q)rm -rf $(call objectify, $(clean-dirs))