diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-16 11:50:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-16 11:50:55 +0100 |
| commit | d7179eca739f52457ae08822cc7f414d3ddea3f8 (patch) | |
| tree | 5e411d6334751f29d8837c59a50b95f1c04b4559 | |
| parent | 6ed8682d9cd410092fe6e361d4b1423fe830523b (diff) | |
| parent | 32481687e1a262a9ca0083f8e938d7b0614d823b (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-build-2019-07-15' into staging
Build system and documentation patches for 2019-07-15
# gpg: Signature made Mon 15 Jul 2019 20:14:38 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-build-2019-07-15:
qemu-tech: Fix dangling @menu entries
Makefile: Fix missing dependency of on qemu-tech.texi
Makefile: Fix "make install" when "make all" needs work
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | qemu-tech.texi | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -522,6 +522,7 @@ $(ROM_DIRS_RULES): recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS)) recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS)) recurse-install: $(addsuffix /install, $(TARGET_DIRS)) +$(addsuffix /install, $(TARGET_DIRS)): all $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o") @@ -1020,7 +1021,8 @@ pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ - qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \ + qemu-img.texi qemu-nbd.texi qemu-options.texi \ + qemu-tech.texi qemu-option-trace.texi \ qemu-deprecated.texi qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \ qemu-monitor-info.texi docs/qemu-block-drivers.texi \ docs/qemu-cpu-models.texi docs/security.texi diff --git a/qemu-tech.texi b/qemu-tech.texi index 3451cfaa5b..0380de77b6 100644 --- a/qemu-tech.texi +++ b/qemu-tech.texi @@ -3,10 +3,7 @@ @menu * CPU emulation:: -* Translator Internals:: -* QEMU compared to other emulators:: * Managed start up options:: -* Bibliography:: @end menu @node CPU emulation |