From 3c089e15b6b92894e43c02b3ae87232e4b8cab45 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 20 Jan 2010 20:54:18 +0100 Subject: Fix generation of config-host.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch improves Anthony patch a6a853c86275efd89996ce59612a000c5873db5d Once there, it improves handling of object files for qemu tools cc: Andreas Färber Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- Makefile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 60d5c66ba9..38486271c2 100644 --- a/Makefile +++ b/Makefile @@ -126,21 +126,14 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) ###################################################################### -qemu-img.o: qemu-img-cmds.h config-host.h +qemu-img.o: qemu-img-cmds.h +qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) -obj-y = qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) -qemu-img$(EXESUF): $(obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) -obj-y = qemu-nbd.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) -$(obj-y): $(GENERATED_HEADERS) - -qemu-nbd$(EXESUF): $(obj-y) - -obj-y = qemu-io.o qemu-tool.o cmd.o $(block-obj-y) $(qobject-obj-y) -$(obj-y): $(GENERATED_HEADERS) - -qemu-io$(EXESUF): $(obj-y) +qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) $(qobject-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") -- cgit v1.2.3