Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' into staging

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 3ad4bc2f17b4fef388bd10a430e03dcd0a2466de..1c4c04f6f2aa765b5186bd3c8d31c4e59930772a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -258,6 +258,7 @@ endif
 
 dummy := $(call unnest-vars,, \
                 stub-obj-y \
+                chardev-obj-y \
                 util-obj-y \
                 qga-obj-y \
                 ivshmem-client-obj-y \
@@ -298,7 +299,11 @@ qemu-version.h: FORCE
                                printf '""\n'; \
                        fi; \
                fi) > [email protected])
-       $(call quiet-command, cmp -s $@ [email protected] || mv [email protected] $@)
+       $(call quiet-command, if ! cmp -s $@ [email protected]; then \
+         mv [email protected] $@; \
+        else \
+         rm [email protected]; \
+        fi)
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
@@ -335,7 +340,8 @@ subdir-dtc:dtc/libfdt dtc/tests
 dtc/%:
        mkdir -p $@
 
-$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y)
+$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \
+       $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y)
 
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 # Only keep -O and -g cflags
@@ -510,7 +516,7 @@ distclean: clean
        rm -f qemu-doc.vr qemu-doc.txt
        rm -f config.log
        rm -f linux-headers/asm
-       rm -f qemu-ga-qapi.texi qemu-qapi.texi
+       rm -f qemu-ga-qapi.texi qemu-qapi.texi version.texi
        rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7
        rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt
        rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf
@@ -587,7 +593,7 @@ endif
 endif
 
 
-install: all $(if $(BUILD_DOCS),install-doc) \
+install: all $(if $(BUILD_DOCS),install-doc) $(BUILD_DIR)/trace-events-all \
 install-datadir install-localstatedir
 ifneq ($(TOOLS),)
        $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
@@ -657,21 +663,24 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \
 
 # documentation
 MAKEINFO=makeinfo
-MAKEINFOFLAGS=--no-split --number-sections -D 'VERSION $(VERSION)'
-TEXIFLAG=$(if $(V),,--quiet) --command='@set VERSION $(VERSION)'
+MAKEINFOFLAGS=--no-split --number-sections
+TEXIFLAG=$(if $(V),,--quiet)
+
+version.texi: $(SRC_PATH)/VERSION
+       $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
 
-%.html: %.texi
+%.html: %.texi version.texi
        $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
        --html $< -o $@,"GEN","$@")
 
-%.info: %.texi
+%.info: %.texi version.texi
        $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")
 
-%.txt: %.texi
+%.txt: %.texi version.texi
        $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
        --plaintext $< -o $@,"GEN","$@")
 
-%.pdf: %.texi
+%.pdf: %.texi version.texi
        $(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I . $< -o $@,"GEN","$@")
 
 qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool