From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCEy-0000lL-DH for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTCEw-0003He-Fl for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:40 -0400 Received: from mail-ea0-x22e.google.com ([2a00:1450:4013:c01::22e]:39175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCEw-0003G6-5N for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:38 -0400 Received: by mail-ea0-f174.google.com with SMTP id m14so1763570eaj.5 for ; Fri, 19 Apr 2013 07:24:37 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 19 Apr 2013 16:24:16 +0200 Message-Id: <1366381460-6041-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366381460-6041-1-git-send-email-pbonzini@redhat.com> References: <1366381460-6041-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/9] virtio: simplify Makefile conditionals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: asias@redhat.com, nab@linux-iscsi.org Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 2 +- hw/virtio/Makefile.objs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index b7a1613..0243d6a 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -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/ diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index c7e8013..cbe6d51 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -1,7 +1,7 @@ -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 -- 1.8.1.4