From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbcGANYK (ORCPT ); Fri, 1 Jul 2016 09:24:10 -0400 Received: from lists.s-osg.org ([54.187.51.154]:49924 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751207AbcGANYI (ORCPT ); Fri, 1 Jul 2016 09:24:08 -0400 Date: Fri, 1 Jul 2016 10:15:55 -0300 From: Mauro Carvalho Chehab To: Jani Nikula Cc: Markus Heiser , Jonathan Corbet , 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: Re: [docs-next PATCH] Documentation/sphinx: skip build if user requested specific DOCBOOKS Message-ID: <20160701101555.5a8efce9@recife.lan> In-Reply-To: <1467375884-10245-1-git-send-email-jani.nikula@intel.com> References: <1467374614-3747-1-git-send-email-jani.nikula@intel.com> <1467375884-10245-1-git-send-email-jani.nikula@intel.com> Organization: Samsung X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, 1 Jul 2016 15:24:44 +0300 Jani Nikula escreveu: > 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. I guess this is actually a wrong assumption. I mean, it is valid to build multiple documents at the same time. Sometimes I do things like: make DOCBOOKS="media_api.xml device-drivers.xml" htmldocs When I want both docs to be compiled. What I would be expecting is that Sphinx would be looking into the DOCBOOKS targets and see if (some) of them belongs to it. Alternatively, we could add a separate makefile var for the Sphinx targets, but the logic would be more complex, as it should: not ignore: make htmldocs ignore: make DOCBOOKS="device-drivers.xml" htmldocs not ignore: make SPHINXDOCS="linux_tv" DOCBOOKS="device-drivers.xml" htmldocs not ignore: make SPHINXDOCS="linux_tv" htmldocs Regards, Mauro > > Cc: Markus Heiser > Cc: Mauro Carvalho Chehab > Fixes: 22cba31bae9d ("Documentation/sphinx: add basic working Sphinx configuration and build") > Signed-off-by: Jani Nikula > --- > 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 -- Thanks, Mauro