Commit e9cd423f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

virtio: simplify Makefile conditionals 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 292c8e50

hw/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ 
devices-dirs-$(CONFIG_SOFTMMU) += timer/

devices-dirs-$(CONFIG_TPM) += tpm/

devices-dirs-$(CONFIG_SOFTMMU) += usb/

devices-dirs-$(CONFIG_SOFTMMU) += virtio/

devices-dirs-$(CONFIG_VIRTIO) += virtio/

devices-dirs-$(CONFIG_SOFTMMU) += watchdog/

devices-dirs-$(CONFIG_SOFTMMU) += xen/

devices-dirs-y += core/

hw/virtio/Makefile.objs

+4 −4
Original line number Diff line number Diff line 
common-obj-$(CONFIG_VIRTIO) += virtio-rng.o

common-obj-y += virtio-rng.o

common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o

common-obj-$(CONFIG_VIRTIO) += virtio-bus.o

common-obj-y += virtio-bus.o

common-obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += dataplane/



obj-$(CONFIG_VIRTIO) += virtio.o virtio-balloon.o 

obj-$(CONFIG_VHOST_NET) += vhost.o
 
obj-y += virtio.o virtio-balloon.o 

obj-$(CONFIG_LINUX) += vhost.o