summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2010-03-21 19:47:07 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-03-21 19:47:07 +0000
commite1060e9d2dc3b892b6be7988e5f8836a847ba05b (patch)
treed24a5a961fb1ac0853743cd27cd16bebae5567e4
parent64dc9c31ae3d3e450c65099715a3fb653927f21f (diff)
downloadqemu-e1060e9d2dc3b892b6be7988e5f8836a847ba05b.tar.gz
qemu-e1060e9d2dc3b892b6be7988e5f8836a847ba05b.tar.bz2
qemu-e1060e9d2dc3b892b6be7988e5f8836a847ba05b.zip
Compile qemu-error only once
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--Makefile.objs2
-rw-r--r--Makefile.target2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 0c13d4fd6a..dc7b4454c8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -44,7 +44,7 @@ net-obj-y += $(addprefix net/, $(net-nested-y))
common-obj-y = $(block-obj-y)
common-obj-y += $(net-obj-y)
common-obj-y += $(qobject-obj-y)
-common-obj-y += readline.o console.o async.o
+common-obj-y += readline.o console.o async.o qemu-error.o
common-obj-y += tcg-runtime.o host-utils.o
common-obj-y += irq.o ioport.o input.o
diff --git a/Makefile.target b/Makefile.target
index 10153db359..32a12a1a76 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -162,7 +162,7 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_SOFTMMU
obj-y = vl.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o
-obj-y += qemu-error.o qemu-timer.o
+obj-y += qemu-timer.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o