projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[deliverable/linux.git]
/
Documentation
/
DocBook
/
Makefile
diff --git
a/Documentation/DocBook/Makefile
b/Documentation/DocBook/Makefile
index 8e6dd4b14314d4bca4c9439a1e04abbde591553c..c481df33ef2150f54c84b2e8516881e8d839ef25 100644
(file)
--- a/
Documentation/DocBook/Makefile
+++ b/
Documentation/DocBook/Makefile
@@
-16,11
+16,9
@@
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
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
-
###
# The build process is as follows (targets):
# (xmldocs) [by docproc]
###
# The build process is as follows (targets):
# (xmldocs) [by docproc]
@@
-49,7
+47,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)
@@
-219,9
+216,6
@@
silent_gen_xml = :
else
else
-# Needed, due to cleanmediadocs
-include Documentation/DocBook/media/Makefile
-
htmldocs:
pdfdocs:
psdocs:
htmldocs:
pdfdocs:
psdocs:
@@
-269,7
+263,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))
This page took
0.088427 seconds
and
5
git commands to generate.