diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:09:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:09:02 -0500 |
| commit | 057643f6c4751651ab640edb9b445cb3816edffc (patch) | |
| tree | 31ba8fd4a0a24d08474ba568a0fd0cfe34a3644e /Makefile | |
| parent | 9f047b8948f43dddb0ee2a391939999fab13eaf4 (diff) | |
| parent | ca8a277ccc911ce8501b1bc984a09f988379d8c3 (diff) | |
| download | qemu-057643f6c4751651ab640edb9b445cb3816edffc.zip qemu-057643f6c4751651ab640edb9b445cb3816edffc.tar.gz qemu-057643f6c4751651ab640edb9b445cb3816edffc.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -145,11 +145,12 @@ endif qemu-img.o: qemu-img-cmds.h qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o qemu-ga.o: $(GENERATED_HEADERS) -qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o +tools-obj-y = qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) \ + $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o - -qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o +qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) +qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") |