From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu50v-0003Gq-C7 for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tu50r-0000VW-Uz for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:37:00 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:54868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu50r-0000VP-OM for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:36:57 -0500 Received: by mail-we0-f175.google.com with SMTP id z53so1373036wey.6 for ; Sat, 12 Jan 2013 09:36:57 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 12 Jan 2013 18:35:35 +0100 Message-Id: <1358012138-21613-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358012138-21613-1-git-send-email-pbonzini@redhat.com> References: <1358012138-21613-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 24/27] build: remove coroutine-obj-y List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Just fold it into block-obj-y. Signed-off-by: Paolo Bonzini --- Makefile.objs | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index aae2696..bc56c61 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -4,34 +4,29 @@ stub-obj-y = stubs/ util-obj-y = util/ qobject/ qapi/ ####################################################################### -# coroutines -coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -coroutine-obj-y += qemu-coroutine-sleep.o - -# If you change this logic, please also check tests/Makefile -ifeq ($(CONFIG_UCONTEXT_COROUTINE),y) -coroutine-obj-$(CONFIG_POSIX) += coroutine-ucontext.o -else -ifeq ($(CONFIG_SIGALTSTACK_COROUTINE),y) -coroutine-obj-$(CONFIG_POSIX) += coroutine-sigaltstack.o -else -coroutine-obj-$(CONFIG_POSIX) += coroutine-gthread.o -endif -endif -coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o - -####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img block-obj-y = async.o thread-pool.o block-obj-y += nbd.o block.o blockjob.o -block-obj-y += $(coroutine-obj-y) block-obj-y += main-loop.o iohandler.o qemu-timer.o block-obj-$(CONFIG_POSIX) += aio-posix.o block-obj-$(CONFIG_WIN32) += aio-win32.o block-obj-y += block/ block-obj-y += qapi-types.o qapi-visit.o +block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +block-obj-y += qemu-coroutine-sleep.o +ifeq ($(CONFIG_UCONTEXT_COROUTINE),y) +block-obj-$(CONFIG_POSIX) += coroutine-ucontext.o +else +ifeq ($(CONFIG_SIGALTSTACK_COROUTINE),y) +block-obj-$(CONFIG_POSIX) += coroutine-sigaltstack.o +else +block-obj-$(CONFIG_POSIX) += coroutine-gthread.o +endif +endif +block-obj-$(CONFIG_WIN32) += coroutine-win32.o + ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. -- 1.8.1