Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1569901
| From | Jani Nikula <jani.nikula@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0 |
| Date | 2017-01-30 18:00 +0100 |
| Message-ID | <t5nt9-6kA-45@gated-at.bofh.it> (permalink) |
| References | <t4nvc-1BT-35@gated-at.bofh.it> |
| Organization | Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo |
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 <jim.epost@gmail.com> Reference: http://lkml.kernel.org/r/CA+r1ZhjRVqkjPXGOGB_BOAX2Hkfb+qQCtTzFfBMFeH1Mfeej7w@mail.gmail.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- 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' -- 2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Extra messages from Makefile.sphinx Jim Davis <jim.epost@gmail.com> - 2017-01-27 23:50 +0100
[PATCH] Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0 Jani Nikula <jani.nikula@intel.com> - 2017-01-30 18:00 +0100
Re: [PATCH] Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0 Jani Nikula <jani.nikula@intel.com> - 2017-01-30 18:20 +0100
Re: [PATCH] Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0 Jonathan Corbet <corbet@lwn.net> - 2017-02-01 21:20 +0100
csiph-web