diff options
| author | Juan Quintela <quintela@redhat.com> | 2010-01-20 20:54:18 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-26 15:42:02 -0600 |
| commit | 3c089e15b6b92894e43c02b3ae87232e4b8cab45 (patch) | |
| tree | a60042e66933e27ea4c433a2358e661f3e7abd22 | |
| parent | 42ee76fe82093ba914f0dc83d2decbcf68866144 (diff) | |
Fix generation of config-host.h
This patch improves Anthony patch a6a853c86275efd89996ce59612a000c5873db5d
Once there, it improves handling of object files for qemu tools
cc: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile | 17 |
1 files changed, 5 insertions, 12 deletions
@@ -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 $@") |