diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-18 01:56:22 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-18 01:56:22 +0000 |
| commit | 1fd31ad763008df26af22fe36ca1d4e1030734d4 (patch) | |
| tree | 751ea484c0cf9fd49e77c95eebced3bf92cf61d4 /Makefile.target | |
| parent | 16b29ae1807b024bd5052301550f5d47dae958a2 (diff) | |
Fix the build for non-x86/ppc targets
Since pci.c creates network devices, anything that links against pci.c
(everything) has to link against all network devices. Since virtio-net
also requires virtio, we might as well link every target against all of
the virtio devices.
This suggests that the pci.c network device creation function needs some
refactoring.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6082 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 6886aadea0..b66b699243 100644 --- a/Makefile.target +++ b/Makefile.target @@ -557,6 +557,9 @@ endif #CONFIG_BSD_USER ifndef CONFIG_USER_ONLY OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o +# virtio has to be here due to weird dependency between PCI and virtio-net. +# need to fix this properly +OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o OBJS+=fw_cfg.o ifdef CONFIG_KVM OBJS+=kvm.o kvm-all.o @@ -636,8 +639,6 @@ OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o -# virtio support -OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), ppc) @@ -663,8 +664,6 @@ endif ifdef CONFIG_KVM OBJS+= kvm_ppc.o endif -# virtio support -OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o endif ifeq ($(TARGET_BASE_ARCH), mips) OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o |