diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-01-30 17:58:15 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-02-01 21:10:54 +0100 |
| commit | c8929258a59b784a61dc0bbe3cfca6ebed5f47c4 (patch) | |
| tree | 393f7d1abab158ebacf0ecbcdce202d8aba388ef /Documentation/Makefile.sphinx | |
| parent | doc-rst: fixed cleandoc target when used with O=dir (diff) | |
| download | linux-c8929258a59b784a61dc0bbe3cfca6ebed5f47c4.tar.xz linux-c8929258a59b784a61dc0bbe3cfca6ebed5f47c4.zip | |
Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0
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>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/Makefile.sphinx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index b88f666f72bb..fd32fc727777 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -91,6 +91,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: @@ -101,8 +106,6 @@ cleandocs: $(Q)rm -rf $(BUILDDIR) $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean -endif # HAVE_SPHINX - dochelp: @echo ' Linux kernel internal documentation in different formats (Sphinx):' @echo ' htmldocs - HTML' |