Patchwork [PULL,1/3] w32: Fix broken out-of-tree builds (missing version.o)

login
register
mail settings
Submitter Stefan Weil
Date Aug. 27, 2013, 12:38 p.m.
Message ID <1377607132-21336-2-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/270100/
State Accepted
Headers show

Comments

Stefan Weil - Aug. 27, 2013, 12:38 p.m.
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>
---
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

Patch

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)