[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/27] build: remove coroutine-obj-y
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 24/27] build: remove coroutine-obj-y |
Date: |
Sat, 12 Jan 2013 18:35:35 +0100 |
Just fold it into block-obj-y.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 19/27] build: move qobject files to qobject/ and libqemuutil.a, (continued)
- [Qemu-devel] [PATCH 19/27] build: move qobject files to qobject/ and libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 21/27] build: move QAPI definitions for QEMU out of qapi-obj-y, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 18/27] build: move libqemuutil.a components to util/, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 25/27] build: some simplifications for "trace/Makefile.objs", Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 26/27] build: fold trace-obj-y into libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 22/27] build: move base QAPI files to libqemuutil.a, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 23/27] build: move version-obj-y to the generic LINK rule, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 27/27] build: improve quiet output for .stp rules, Paolo Bonzini, 2013/01/12
- [Qemu-devel] [PATCH 24/27] build: remove coroutine-obj-y,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/27] More source reorganization and build system TLC, Stefan Hajnoczi, 2013/01/14
- Re: [Qemu-devel] [PULL 00/27] More source reorganization and build system TLC, Andreas Färber, 2013/01/18