summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Weil2013-08-08 20:18:07 +0200
committerAnthony Liguori2013-08-12 16:19:05 +0200
commit0b516ef0dfad9a7b34c675c98e8ec92ab4d38466 (patch)
treea2b27cea7a2eb0c3bf53e2e3b712209f69d81374 /Makefile
parentqemu-option: Guard against qemu_opts_set_defaults() misuse (diff)
downloadqemu-0b516ef0dfad9a7b34c675c98e8ec92ab4d38466.tar.gz
qemu-0b516ef0dfad9a7b34c675c98e8ec92ab4d38466.tar.xz
qemu-0b516ef0dfad9a7b34c675c98e8ec92ab4d38466.zip
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 29f10436f8..4d257f1a52 100644
--- a/Makefile
+++ b/Makefile
@@ -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)