Change target `make htmldocs` to combine RST Sphinx and the generation of Rust documentation, when support is available. Reviewed-by: Akira Yokosawa <akiyks@xxxxxxxxx> Signed-off-by: Carlos Bilbao <carlos.bilbao@xxxxxxx> --- Documentation/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/Makefile b/Documentation/Makefile index 64d44c1ecad3..701ccb07e873 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -59,6 +59,10 @@ PAPEROPT_letter = -D latex_paper_size=letter KERNELDOC = $(srctree)/scripts/kernel-doc KERNELDOC_CONF = -D kerneldoc_srctree=$(srctree) -D kerneldoc_bin=$(KERNELDOC) ALLSPHINXOPTS = $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) +ifeq ($(CONFIG_RUST),y) +# Let Sphinx know we will include rustdoc +ALLSPHINXOPTS += -t rustdoc +endif # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . @@ -94,6 +98,10 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) htmldocs: @$(srctree)/scripts/sphinx-pre-install --version-check @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var))) +# If Rust support is available, add rustdoc generated contents +ifeq ($(CONFIG_RUST),y) + $(Q)$(MAKE) rustdoc +endif linkcheckdocs: @$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var))) -- 2.34.1
