Commit 627e32df authored by Markus Heiser's avatar Markus Heiser Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarMarkus Heiser <markus.heiser@darmarIT.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 03776378

Documentation/Makefile.sphinx

+2 −2
Original line number Diff line number Diff line
@@ -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:

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

Documentation/linux_tv/media/dvb/audio_h.rst

+3 −1
Original line number Diff line number Diff line
@@ -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

Documentation/linux_tv/media/dvb/ca_h.rst

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ 
DVB Conditional Access Header File

**********************************



.. include:: ../../../output/ca.h.rst
 
.. kernel-include:: $BUILDDIR/ca.h.rst

Documentation/linux_tv/media/dvb/dmx_h.rst

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ 
DVB Demux Header File

*********************



.. include:: ../../../output/dmx.h.rst
 
.. kernel-include:: $BUILDDIR/dmx.h.rst