diff mbox series

[PULL,08/12] Makefile: Allow for subdirectories in Sphinx manual dependencies

Message ID 20200312114408.16891-9-peter.maydell@linaro.org
State Accepted
Commit 814e068fb2324173a29cdfd890bb8c86af5e3032
Headers show
Series docs queue | expand

Commit Message

Peter Maydell March 12, 2020, 11:44 a.m. UTC 
Currently we put 'docs/foo/*.rst' in the Make list of dependencies
for the Sphinx 'foo' manual, which means all the files must be
in the top level of that manual's directory. We'd like to be
able to have subdirectories inside some of the manuals, so add
'docs/foo/*/*.rst' to the dependencies too.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20200309215818.2021-2-peter.maydell@linaro.org
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.1
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 65e89b5095a..7df22fcc5da 100644
--- a/Makefile
+++ b/Makefile
@@ -1078,7 +1078,7 @@  sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \
 # a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946
 build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) -W -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")
 # We assume all RST files in the manual's directory are used in it
-manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) \
+manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*/*.rst) \
               $(SRC_PATH)/docs/defs.rst.inc \
               $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py \
               $(SRC_PATH)/docs/sphinx/*.py