From: Jani Nikula <jani.nikula@intel.com>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
"Luis R. Rodriguez" <mcgrof@kernel.org>
Cc: "jani. nikula" <jani.nikula@intel.com>,
linux-doc@vger.kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jonathan Corbet <corbet@lwn.net>,
Markus Heiser <markus.heiser@darmarit.de>
Subject: [RFC PATCH 1/3] Documentation/sphinx: build the media intermediate rst files for all outputs
Date: Wed, 10 Aug 2016 18:54:07 +0300 [thread overview]
Message-ID: <62300587631fd2c5d411ad2660fb7c67ecdeb85d.1470844185.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1470844185.git.jani.nikula@intel.com>
In-Reply-To: <cover.1470844185.git.jani.nikula@intel.com>
This is a stopgap measure to allow building outputs other than html.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Documentation/Makefile.sphinx | 3 +--
Documentation/media/Makefile | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 857f1e273418..d24a9f12a280 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -38,10 +38,9 @@ ALLSPHINXOPTS = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(B
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
quiet_cmd_sphinx = SPHINX $@
- cmd_sphinx = BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
+ cmd_sphinx = $(MAKE) BUILDDIR=$(BUILDDIR) $(build)=Documentation/media all; BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
htmldocs:
- $(MAKE) BUILDDIR=$(BUILDDIR) -f $(srctree)/Documentation/media/Makefile $@
$(call cmd,sphinx,html)
pdfdocs:
diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile
index 39e2d766dbe3..a7fb35291f6c 100644
--- a/Documentation/media/Makefile
+++ b/Documentation/media/Makefile
@@ -10,7 +10,8 @@ FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \
TARGETS := $(addprefix $(BUILDDIR)/, $(FILES))
-htmldocs: $(BUILDDIR) ${TARGETS}
+.PHONY: all
+all: $(BUILDDIR) ${TARGETS}
$(BUILDDIR):
$(Q)mkdir -p $@
--
2.1.4
next prev parent reply other threads:[~2016-08-10 18:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 1:19 Making pdfdocs with sphinx - only select rst targets Luis R. Rodriguez
2016-08-10 8:41 ` Mauro Carvalho Chehab
[not found] ` <CAB=NE6UUiKSn66=F+WUrqk3E1tj+fnzqFnD=dX55md6RnaiOgQ@mail.gmail.com>
2016-08-10 15:05 ` Mauro Carvalho Chehab
2016-08-10 15:54 ` [RFC PATCH 0/3] Documentation: switch to pdflatex and fix pdf build Jani Nikula
2016-08-10 15:54 ` Jani Nikula [this message]
2016-08-10 16:14 ` [RFC PATCH 1/3] Documentation/sphinx: build the media intermediate rst files for all outputs Mauro Carvalho Chehab
2016-08-10 15:54 ` [RFC PATCH 2/3] Documentation: switch to pdflatex for pdf generation Jani Nikula
2016-08-10 17:15 ` Markus Heiser
2016-08-10 20:07 ` Luis R. Rodriguez
2016-08-10 15:54 ` [RFC PATCH 3/3] Documentation: exclude media documentation from " Jani Nikula
2016-08-10 16:16 ` Mauro Carvalho Chehab
2016-08-10 16:31 ` Markus Heiser
2016-08-10 20:05 ` Luis R. Rodriguez
2016-08-10 16:27 ` [RFC PATCH 0/3] Documentation: switch to pdflatex and fix pdf build Markus Heiser
2016-08-10 20:09 ` Luis R. Rodriguez
2016-08-12 22:40 ` Jonathan Corbet
2016-08-13 16:00 ` Markus Heiser
2016-08-15 9:40 ` Jani Nikula
2016-08-15 12:17 ` Mauro Carvalho Chehab
2016-08-15 22:26 ` Mauro Carvalho Chehab
2016-08-19 12:54 ` Jani Nikula
2016-08-19 13:21 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62300587631fd2c5d411ad2660fb7c67ecdeb85d.1470844185.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=corbet@lwn.net \
--cc=daniel.vetter@ffwll.ch \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus.heiser@darmarit.de \
--cc=mcgrof@kernel.org \
--cc=mchehab@infradead.org \
--cc=mchehab@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®