leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc-rst: linux_tv/Makefile: Honor quiet make O=dir

Browse Source 
To honor the:

  make O=dir [targets] Locate all output files in "dir"

* activate kernel-include directive
* export BUILDDIR=$(BUILDDIR)
* linux_tv: replace '.. include::' with '.. kernel-include:: $BUILDDIR/<foo.h.rst>'

Signed-off-by: Markus Heiser <markus.heiser@darmarIT.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Markus Heiser 2016-07-08 14:15:05 +02:00 committed by Mauro Carvalho Chehab
parent 037763785a
commit 627e32df1a
9 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/Makefile.sphinx
View File

@ -32,10 +32,10 @@ ALLSPHINXOPTS = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(B
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
quiet_cmd_sphinx = SPHINX $@
cmd_sphinx = $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
cmd_sphinx = BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
htmldocs:
$(MAKE) BUILDDIR=$(objtree)/$(BUILDDIR) -f $(srctree)/Documentation/linux_tv/Makefile $@
$(MAKE) BUILDDIR=$(BUILDDIR) -f $(srctree)/Documentation/linux_tv/Makefile $@
$(call cmd,sphinx,html)
pdfdocs:

2
Documentation/conf.py
View File

@ -28,7 +28,7 @@ sys.path.insert(0, os.path.abspath('sphinx'))
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['kernel-doc', 'rstFlatTable']
extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include']
# Gracefully handle missing rst2pdf.
try:

4
Documentation/linux_tv/media/dvb/audio_h.rst
View File

@ -6,4 +6,6 @@
DVB Audio Header File
*********************
.. include:: ../../../output/audio.h.rst
.. kernel-include:: $BUILDDIR/audio.h.rst
.. kernel-include:: $BUILDDIR/../../../../etc/adduser.conf

2
Documentation/linux_tv/media/dvb/ca_h.rst
View File

@ -6,4 +6,4 @@
DVB Conditional Access Header File
**********************************
.. include:: ../../../output/ca.h.rst
.. kernel-include:: $BUILDDIR/ca.h.rst

2
Documentation/linux_tv/media/dvb/dmx_h.rst
View File

@ -6,4 +6,4 @@
DVB Demux Header File
*********************
.. include:: ../../../output/dmx.h.rst
.. kernel-include:: $BUILDDIR/dmx.h.rst

2
Documentation/linux_tv/media/dvb/frontend_h.rst
View File

@ -6,4 +6,4 @@
DVB Frontend Header File
************************
.. include:: ../../../output/frontend.h.rst
.. kernel-include:: $BUILDDIR/frontend.h.rst

2
Documentation/linux_tv/media/dvb/net_h.rst
View File

@ -6,4 +6,4 @@
DVB Network Header File
***********************
.. include:: ../../../output/net.h.rst
.. kernel-include:: $BUILDDIR/net.h.rst

2
Documentation/linux_tv/media/dvb/video_h.rst
View File

@ -6,4 +6,4 @@
DVB Video Header File
*********************
.. include:: ../../../output/video.h.rst
.. kernel-include:: $BUILDDIR/video.h.rst

2
Documentation/linux_tv/media/v4l/videodev.rst
View File

@ -6,4 +6,4 @@
Video For Linux Two Header File
*******************************
.. include:: ../../../output/videodev2.h.rst
.. kernel-include:: $BUILDDIR/videodev2.h.rst