diff options
| author | Paolo Bonzini | 2020-02-28 16:35:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-03-06 11:04:57 +0100 |
| commit | 091479301f96d0e1df0ab12f18d1b265979cba47 (patch) | |
| tree | f518e7b1ce0177459d8d54b41fe11e852ee39889 /Makefile | |
| parent | Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf4' i... (diff) | |
| download | qemu-091479301f96d0e1df0ab12f18d1b265979cba47.tar.gz qemu-091479301f96d0e1df0ab12f18d1b265979cba47.tar.xz qemu-091479301f96d0e1df0ab12f18d1b265979cba47.zip | |
qemu-doc: convert user-mode emulation to a separate Sphinx manual
The final addition to the set of QEMU manuals is the user-mode emulation
manual, which right now is included in qemu-doc.texi. Extract it and
convert it to rST, so that qemu-doc.texi covers only full system emulation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20200228153619.9906-2-peter.maydell@linaro.org
Message-id: 20200226113034.6741-2-pbonzini@redhat.com
[PMM: Fix makefile conflicts; add user manual to
index.rst and index.html.in; don't specify empty man_pages
list; fixed a few comments to say 'user' rather than 'system']
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -787,6 +787,7 @@ distclean: clean $(call clean-manual,specs) $(call clean-manual,system) $(call clean-manual,tools) + $(call clean-manual,user) for d in $(TARGET_DIRS); do \ rm -rf $$d || exit 1 ; \ done @@ -845,6 +846,7 @@ install-sphinxdocs: sphinxdocs $(call install-manual,specs) $(call install-manual,system) $(call install-manual,tools) + $(call install-manual,user) install-doc: $(DOCS) install-sphinxdocs $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" @@ -1039,7 +1041,8 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ $(MANUAL_BUILDDIR)/interop/index.html \ $(MANUAL_BUILDDIR)/specs/index.html \ $(MANUAL_BUILDDIR)/system/index.html \ - $(MANUAL_BUILDDIR)/tools/index.html + $(MANUAL_BUILDDIR)/tools/index.html \ + $(MANUAL_BUILDDIR)/user/index.html # Canned command to build a single manual # Arguments: $1 = manual name, $2 = Sphinx builder ('html' or 'man') @@ -1074,6 +1077,9 @@ $(MANUAL_BUILDDIR)/system/index.html: $(call manual-deps,system) $(MANUAL_BUILDDIR)/tools/index.html: $(call manual-deps,tools) $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/docs/qemu-option-trace.rst.inc $(call build-manual,tools,html) +$(MANUAL_BUILDDIR)/user/index.html: $(call manual-deps,user) + $(call build-manual,user,html) + $(call define-manpage-rule,interop,qemu-ga.8) $(call define-manpage-rule,system,qemu-block-drivers.7) |