From: Blue Swirl <blauwirbel@gmail.com>
Date: Mon, 22 Mar 2010 20:18:58 +0000 (+0000)
Subject: Compile virtio-pci only once
X-Git-Tag: v0.13.0-rc0~988
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f51bdab44ee7e5286e05a0b25ccc612b14231e2;p=thirdparty%2Fqemu.git

Compile virtio-pci only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/Makefile.objs b/Makefile.objs
index ede3f28259b..281f7a6622b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -128,7 +128,7 @@ user-obj-y += cutils.o cache-utils.o
 
 hw-obj-y =
 hw-obj-y += loader.o
-hw-obj-y += virtio.o virtio-console.o
+hw-obj-y += virtio.o virtio-console.o virtio-pci.o
 hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
 hw-obj-y += watchdog.o
 hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
diff --git a/Makefile.target b/Makefile.target
index 389f6e51e63..eb4d010f59d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -165,7 +165,7 @@ obj-y = vl.o monitor.o machine.o gdbstub.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
+obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
 obj-y += rwhandler.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 LIBS+=-lz