Commit d7179eca authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6ed8682d 32481687

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -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

qemu-tech.texi

+0 −3
Original line number Diff line number Diff line
@@ -3,10 +3,7 @@ 


@menu

* CPU emulation::

* Translator Internals::

* QEMU compared to other emulators::

* Managed start up options::

* Bibliography::

@end menu



@node CPU emulation