aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-08-16 21:51:53 +0200
committerStefan Weil <sw@weilnetz.de>2013-08-27 14:21:16 +0200
commit7e75e33e7886314490305f181065b8b4ec916a8a (patch)
tree5e3e4318f7c919fa950aa3e073eef1cd7f6f6db3 /Makefile
parentf7ad538e1ea130c8b6f3abb06ad6c856242c799e (diff)
downloadqemu-7e75e33e7886314490305f181065b8b4ec916a8a.zip
qemu-7e75e33e7886314490305f181065b8b4ec916a8a.tar.gz
qemu-7e75e33e7886314490305f181065b8b4ec916a8a.tar.bz2
w32: Fix broken out-of-tree builds (missing version.o)
Commit 0b516ef0dfad9a7b34c675c98e8ec92ab4d38466 added version.o to all executables, but broke out-of-tree builds: for those builds the pattern rule %.o: %.rc from rules.mak does not match, so version.o was no longer built. Adding explicit build rules fixes this. Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Stefan Weil <sw@weilnetz.de> Tested-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4d257f1..806946e 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,9 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo
+ $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o")
$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h
+ $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.lo")
Makefile: $(version-obj-y) $(version-lobj-y)