Makefile: make qemu-img dependant on config-host.h
PATCH 1/1 Makefile: make qemu-img dependant on config-host.h
Since config-host.h is generated by the Makefile (1215c6e76), building (only) qemu-img fails:
[user@f12-uri qemu]$ make distclean (or git clone qemu) [user@f12-uri qemu]$ ./configure ...
[user@f12-uri qemu]$ make qemu-img
GEN config-all-devices.mak
GEN qemu-img-cmds.h
CC qemu-img.o
In file included from qemu-img.c:24:
qemu-common.h:32:25: error: config-host.h: No such file or directory
--- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Makefile +1 -1
@@ -200,7 +200,7 @@ libqemu_common.a: $(obj-y) ###################################################################### -qemu-img.o: qemu-img-cmds.h +qemu-img.o: config-host.h qemu-img-cmds.h qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y)
Signature · 3 lines
1.6.5.1 Sent from my KVM Fedora-12-Beta VM.
PATCH 1/1 Makefile: Fix problems in parallel builds
The build-all rule used to call make recursively to avoid problems with a wrong build order in parallel makes (config-host.h was sometimes built too late).
Most object files depend on config-host.h, so adding the missing prerequisites now allows to avoid recursive calls of make and to simplify the rule for build-all.
A similar patch from Uri Lublin which fixed the rule for qemu-img.o is no longer needed.
--- Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
Makefile +4 -2
@@ -40,8 +40,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) -include config-all-devices.mak -build-all: config-host.h config-all-devices.h $(DOCS) $(TOOLS) - $(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) recurse-all,) +build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak
@@ -207,9 +206,12 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) libqemu_common.a: $(obj-y) +$(obj-y): config-host.h + ###################################################################### qemu-img.o: qemu-img-cmds.h +qemu-img.o qemu-nbd.o qemu-io.o: config-host.h qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y)
Signature · 1 line
1.5.6.5