Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8929258 authored by Jani Nikula's avatar Jani Nikula Committed by Jonathan Corbet
Browse files

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: default avatarJim Davis <jim.epost@gmail.com>
Reference: http://lkml.kernel.org/r/CA+r1ZhjRVqkjPXGOGB_BOAX2Hkfb+qQCtTzFfBMFeH1Mfeej7w@mail.gmail.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 7cabd5ac

Documentation/Makefile.sphinx

+5 −2
Original line number Diff line number Diff line
@@ -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'