aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-12-20 16:10:26 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-12 18:42:50 +0100
commita372823a14461c454feaa86373bd672fd518847a (patch)
tree1f6241ae89b48012f24895e5b7c3be3ec0c53cb6 /Makefile.objs
parentbaacf04799ace72a9c735dd9306a1ceaf305e7cf (diff)
downloadqemu-a372823a14461c454feaa86373bd672fd518847a.zip
qemu-a372823a14461c454feaa86373bd672fd518847a.tar.gz
qemu-a372823a14461c454feaa86373bd672fd518847a.tar.bz2
build: move qobject files to qobject/ and libqemuutil.a
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs17
1 files changed, 3 insertions, 14 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 3b777c8..d412d8c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,6 +1,7 @@
#######################################################################
-# Stub library, linked in tools
+# Common libraries for tools and emulators
stub-obj-y = stubs/
+util-obj-y = util/ qobject/
#######################################################################
# Target-independent parts used in system and user emulation
@@ -8,14 +9,6 @@ universal-obj-y =
universal-obj-y += qemu-log.o
#######################################################################
-# QObject
-qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
-qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
-qobject-obj-y += qerror.o
-
-universal-obj-y += $(qobject-obj-y)
-
-#######################################################################
# QOM
qom-obj-y = qom/
@@ -28,10 +21,6 @@ hw-core-obj-y += hw/
universal-obj-y += $(hw-core-obj-y)
#######################################################################
-# util-obj-y is code depending on the OS (win32 vs posix)
-util-obj-y += util/
-
-#######################################################################
# coroutines
coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
coroutine-obj-y += qemu-coroutine-sleep.o
@@ -53,7 +42,7 @@ coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o
block-obj-y = async.o thread-pool.o
block-obj-y += nbd.o block.o blockjob.o
-block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)
+block-obj-y += $(coroutine-obj-y) $(version-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