[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/12] Makefile: Allow for subdirectories in Sphinx manual depende
From: |
Peter Maydell |
Subject: |
[PULL 08/12] Makefile: Allow for subdirectories in Sphinx manual dependencies |
Date: |
Thu, 12 Mar 2020 11:44:04 +0000 |
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 <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Niek Linnenbank <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.20.1
- [PULL 00/12] docs queue, Peter Maydell, 2020/03/12
- [PULL 01/12] Makefile: Remove redundant Texinfo related code, Peter Maydell, 2020/03/12
- [PULL 02/12] Update comments in .hx files that mention Texinfo, Peter Maydell, 2020/03/12
- [PULL 03/12] hxtool: Remove Texinfo generation support, Peter Maydell, 2020/03/12
- [PULL 04/12] docs/sphinx/hxtool.py: Remove STEXI/ETEXI support, Peter Maydell, 2020/03/12
- [PULL 05/12] Makefile: Make all Sphinx documentation depend on the extensions, Peter Maydell, 2020/03/12
- [PULL 06/12] docs/index.rst, docs/index.html.in: Reorder manuals, Peter Maydell, 2020/03/12
- [PULL 07/12] docs/qemu-option-trace.rst.inc: Remove redundant comment, Peter Maydell, 2020/03/12
- [PULL 08/12] Makefile: Allow for subdirectories in Sphinx manual dependencies,
Peter Maydell <=
- [PULL 10/12] docs/system/target-arm.rst: Add some introductory text, Peter Maydell, 2020/03/12
- [PULL 11/12] docs: Move arm-cpu-features.rst into the system manual, Peter Maydell, 2020/03/12
- [PULL 09/12] docs/system: Split target-arm.rst into sub-documents, Peter Maydell, 2020/03/12
- [PULL 12/12] docs: Be consistent about capitalization of 'Arm', Peter Maydell, 2020/03/12
- Re: [PULL 00/12] docs queue, Peter Maydell, 2020/03/12