From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752517AbdA3RMY (ORCPT ); Mon, 30 Jan 2017 12:12:24 -0500 Received: from mga04.intel.com ([192.55.52.120]:26456 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751127AbdA3RMW (ORCPT ); Mon, 30 Jan 2017 12:12:22 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,312,1477983600"; d="scan'208";a="815080888" From: Jani Nikula To: Jim Davis , linux-doc , linux-kernel Subject: Re: [PATCH] Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0 In-Reply-To: <1485795495-22680-1-git-send-email-jani.nikula@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1485795495-22680-1-git-send-email-jani.nikula@intel.com> Date: Mon, 30 Jan 2017 19:12:14 +0200 Message-ID: <874m0giia9.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 30 Jan 2017, Jani Nikula wrote: > Make targets that don't depend on Sphinx work without warnings about > missing Sphinx. 'make cleandocs' will work without Sphinx just fine, and > the targets that are no-ops for Sphinx should just be skipped. Move them > outside of the HAVE_SPHINX checks to take precedence over the .DEFAULT > target for HAVE_SPHINX=0. > > Reported-by: Jim Davis > Reference: http://lkml.kernel.org/r/CA+r1ZhjRVqkjPXGOGB_BOAX2Hkfb+qQCtTzFfBMFeH1Mfeej7w@mail.gmail.com Cc: stable@vger.kernel.org Might not be unreasonable. > Signed-off-by: Jani Nikula > --- > Documentation/Makefile.sphinx | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx > index 707c65337ebf..d1aa7ffdea64 100644 > --- a/Documentation/Makefile.sphinx > +++ b/Documentation/Makefile.sphinx > @@ -90,6 +90,11 @@ epubdocs: > xmldocs: > @$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,xml,$(var),xml,$(var))) > > +endif # HAVE_SPHINX > + > +# The following targets are independent of HAVE_SPHINX, and the rules should > +# work or silently pass without Sphinx. > + > # no-ops for the Sphinx toolchain > sgmldocs: > psdocs: > @@ -100,8 +105,6 @@ cleandocs: > $(Q)rm -rf $(BUILDDIR) > $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) -C Documentation/media clean > > -endif # HAVE_SPHINX > - > dochelp: > @echo ' Linux kernel internal documentation in different formats (Sphinx):' > @echo ' htmldocs - HTML' -- Jani Nikula, Intel Open Source Technology Center