diff options
| author | Stefan Weil <sw@weilnetz.de> | 2013-08-08 20:18:07 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-12 09:19:05 -0500 |
| commit | 0b516ef0dfad9a7b34c675c98e8ec92ab4d38466 (patch) | |
| tree | a2b27cea7a2eb0c3bf53e2e3b712209f69d81374 | |
| parent | cb77d1925ac4d673e19be58aa39fc53c5d2fed10 (diff) | |
| download | qemu-0b516ef0dfad9a7b34c675c98e8ec92ab4d38466.tar.gz | |
w32: Add missing version.o to all executables (fix regression)
QEMU executables for w32, w64 had included meta information built from
version.rc. These rules were changed several times some months ago.
The latest version added version.o to the tools, but not to the system
emulations.
This patch adds the meta information to all system emulations again.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 1375985887-3984-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.objs | 5 |
2 files changed, 7 insertions, 5 deletions
@@ -167,11 +167,8 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) -version.o: $(SRC_PATH)/version.rc config-host.h | version.lo -version.lo: $(SRC_PATH)/version.rc config-host.h - -version-obj-$(CONFIG_WIN32) += version.o -version-lobj-$(CONFIG_WIN32) += version.lo +$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo +$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h Makefile: $(version-obj-y) $(version-lobj-y) diff --git a/Makefile.objs b/Makefile.objs index 9928542cdf..f46a4cdd6a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -99,6 +99,11 @@ common-obj-y += qom/ common-obj-y += disas/ ###################################################################### +# Resource file for Windows executables +version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o +version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo + +###################################################################### # guest agent # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed |