diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2009-08-10 22:30:24 +0300 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-24 08:46:47 -0500 |
commit | 3987e1cf6db2ce530e0b01ae120933b6cca28b90 (patch) | |
tree | ba977ed0f8ef0151ca65f40d10378d7d58df67fc | |
parent | 793cbfb5d1e879a2d5d67eaa36f67a3f21ef52a5 (diff) | |
download | qemu-3987e1cf6db2ce530e0b01ae120933b6cca28b90.zip qemu-3987e1cf6db2ce530e0b01ae120933b6cca28b90.tar.gz qemu-3987e1cf6db2ce530e0b01ae120933b6cca28b90.tar.bz2 |
qemu: move virtio-pci.o to near pci.o
virtio-pci depends, and will always depend, on pci.c
so it makes sense to keep it in the same makefile,
(unlike the rest of virtio files which should eventually
be moved out to Makefile.hw).
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | Makefile.hw | 2 | ||||
-rw-r--r-- | Makefile.target | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.hw b/Makefile.hw index 139412e..6472ec1 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -11,7 +11,7 @@ VPATH=$(SRC_PATH):$(SRC_PATH)/hw QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu obj-y = -obj-y += virtio.o virtio-pci.o +obj-y += virtio.o obj-y += fw_cfg.o obj-y += watchdog.o obj-y += nand.o ecc.o diff --git a/Makefile.target b/Makefile.target index ed94840..690f30b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -152,7 +152,7 @@ obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \ gdbstub.o gdbstub-xml.o msix.o ioport.o qemu-config.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-console.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o LIBS+=-lz |