Commit 0b516ef0 authored Aug 08, 2013 by Stefan Weil Committed by Anthony Liguori Aug 12, 2013

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>

parent cb77d192

Makefile

+2 −5

Original line number	Diff line number	Diff line
		@@ -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)

Makefile.objs

+5 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,11 @@ common-obj-y += hw/
		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