mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: Markus Heiser <markus.heiser@darmarit.de>
Cc: Jani Nikula <jani.nikula@intel.com>,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
	Jonathan Corbet <corbet@lwn.net>,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	hverkuil@xs4all.nl, daniel.vetter@ffwll.ch, airlied@gmail.com,
	grant.likely@secretlab.ca, rdunlap@infradead.org,
	keithp@keithp.com
Subject: [docs-next PATCH] Documentation/sphinx: skip build if user requested specific DOCBOOKS
Date: Fri,  1 Jul 2016 15:24:44 +0300	[thread overview]
Message-ID: <1467375884-10245-1-git-send-email-jani.nikula@intel.com> (raw)
In-Reply-To: <1467374614-3747-1-git-send-email-jani.nikula@intel.com>

If the user requested specific DocBooks to be built using 'make
DOCBOOKS=foo.xml htmldocs', assume no Sphinx build is desired. This
check is transitional, and can be removed once we drop the DocBook
build.

Cc: Markus Heiser <markus.heiser@darmarit.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Fixes: 22cba31bae9d ("Documentation/sphinx: add basic working Sphinx configuration and build")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 Documentation/Makefile.sphinx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 6c203745b6c6..d8d13c92a178 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -17,6 +17,12 @@ ifeq ($(HAVE_SPHINX),0)
 	$(warning The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed and in PATH, or set the SPHINXBUILD make variable to point to the full path of the '$(SPHINXBUILD)' executable.)
 	@echo "  SKIP    Sphinx $@ target."
 
+else ifneq ($(DOCBOOKS),)
+
+# Skip Sphinx build if the user explicitly requested DOCBOOKS.
+.DEFAULT:
+	@echo "  SKIP    Sphinx $@ target (DOCBOOKS specified)."
+
 else # HAVE_SPHINX
 
 # User-friendly check for rst2pdf
-- 
2.1.4

  reply	other threads:[~2016-07-01 12:27 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-30 12:00 [PATCH] doc: flat-table directive Markus Heiser
2016-06-30 12:00 ` [PATCH] doc-rst: flat-table directive - initial implementation Markus Heiser
2016-06-30 19:05 ` [PATCH] doc: flat-table directive Jonathan Corbet
2016-06-30 19:31   ` Mauro Carvalho Chehab
2016-06-30 19:44   ` Mauro Carvalho Chehab
2016-07-01  8:44     ` Markus Heiser
2016-07-01  9:38       ` Mauro Carvalho Chehab
2016-07-01 10:44         ` Jani Nikula
2016-07-01 11:12           ` Markus Heiser
2016-07-01 11:56             ` Jani Nikula
2016-07-01 12:03               ` [docs-next PATCH] Documentation: add cleanmediadocs to the documentation targets Jani Nikula
2016-07-01 12:24                 ` Jani Nikula [this message]
2016-07-01 12:31                   ` [docs-next PATCH] Documentation/sphinx: skip build if user requested specific DOCBOOKS Markus Heiser
2016-07-01 13:15                   ` Mauro Carvalho Chehab
2016-07-01 13:31                     ` Jani Nikula
2016-07-01 15:09                       ` Mauro Carvalho Chehab
2016-07-01 12:04               ` [PATCH] doc: flat-table directive Markus Heiser
2016-07-01 12:26                 ` Jani Nikula
2016-07-01 13:06                   ` Mauro Carvalho Chehab
2016-07-01 12:52           ` Mauro Carvalho Chehab
2016-07-01 12:58           ` Jonathan Corbet
2016-07-01 14:45             ` Markus Heiser
2016-07-01 17:24               ` Jani Nikula
2016-07-01 18:17                 ` Mauro Carvalho Chehab
2016-07-01 18:47                   ` Jani Nikula
2016-07-01 12:18         ` Markus Heiser
2016-07-01 12:59           ` Mauro Carvalho Chehab
2016-07-01 13:09           ` Jani Nikula
2016-07-01 14:07             ` Markus Heiser
2016-07-01 15:00               ` Mauro Carvalho Chehab
2016-07-01 15:01               ` Mauro Carvalho Chehab
2016-07-06 22:58               ` Mauro Carvalho Chehab
2016-07-01 12:08     ` Jani Nikula
2016-07-01  6:35   ` Markus Heiser
2016-07-01 18:25 ` Captions numbering support 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=1467375884-10245-1-git-send-email-jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=airlied@gmail.com \
    --cc=corbet@lwn.net \
    --cc=daniel.vetter@ffwll.ch \
    --cc=grant.likely@secretlab.ca \
    --cc=hverkuil@xs4all.nl \
    --cc=keithp@keithp.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=markus.heiser@darmarit.de \
    --cc=mchehab@osg.samsung.com \
    --cc=rdunlap@infradead.org \
    /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®