aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-08-10 17:14:11 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-24 08:02:55 -0500
commita25a0ef51e642130017e19f3e41af1b794aa75c1 (patch)
tree207ba86cf1a85e5a724c8445f278591a48a45be4 /Makefile
parentUnbreak large mem support by removing kqemu (diff)
downloadqemu-kvm-a25a0ef51e642130017e19f3e41af1b794aa75c1.tar.gz
qemu-kvm-a25a0ef51e642130017e19f3e41af1b794aa75c1.tar.bz2
qemu-kvm-a25a0ef51e642130017e19f3e41af1b794aa75c1.zip
Only build osdep once
We no longer need hackery to work around kqemu Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d152b6be1..e8325344d 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
# block-obj-y is code used by both qemu system emulation and qemu-img
block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
-block-obj-y += nbd.o block.o aio.o aes.o
+block-obj-y += nbd.o block.o aio.o aes.o osdep.o
block-obj-$(CONFIG_AIO) += posix-aio-compat.o
block-nested-y += cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
@@ -170,11 +170,11 @@ libqemu_user.a: $(user-obj-y)
qemu-img.o: qemu-img-cmds.h
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(block-obj-y)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y)
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(block-obj-y)
+qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y)
-qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y)
+qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y)
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@")