From 12a074387284fc530876ef709b3d344adea9b226 Mon Sep 17 00:00:00 2001

From: Amit Shah <amit.shah@redhat.com>

Date: Wed, 20 Jan 2010 00:36:57 +0530

Subject: [PATCH 7/9] Move virtio-serial to Makefile.objs

There's nothing target-dependent in the virtio-serial code so allow it

to be compiled just once for all the targets.

Signed-off-by: Amit Shah <amit.shah@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

---

 Makefile.hw     |    2 +-

 Makefile.target |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw

index 6f4dbc4..de8a0c5 100644

--- a/Makefile.hw

+++ b/Makefile.hw

@@ -13,7 +13,7 @@ QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu

 obj-y =

 obj-y += loader.o

-obj-y += virtio.o

+obj-y += virtio.o virtio-serial.o

 obj-y += fw_cfg.o

 obj-y += watchdog.o

 obj-$(CONFIG_ECC) += ecc.o

diff --git a/Makefile.target b/Makefile.target

index 234577c..0e4cfd1 100644

--- a/Makefile.target

+++ b/Makefile.target

@@ -166,7 +166,7 @@ ifdef CONFIG_SOFTMMU

 obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.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-serial.o virtio-serial-bus.o virtio-pci.o

+obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o

 obj-$(CONFIG_KVM) += kvm.o kvm-all.o

 # MSI-X depends on kvm for interrupt injection,

 # so moved it from Makefile.hw to Makefile.target for now

-- 

1.6.2.5