diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.objs | 17 | ||||
| -rw-r--r-- | qobject/Makefile.objs | 3 | ||||
| -rw-r--r-- | qobject/json-lexer.c (renamed from json-lexer.c) | 0 | ||||
| -rw-r--r-- | qobject/json-parser.c (renamed from json-parser.c) | 0 | ||||
| -rw-r--r-- | qobject/json-streamer.c (renamed from json-streamer.c) | 0 | ||||
| -rw-r--r-- | qobject/qbool.c (renamed from qbool.c) | 0 | ||||
| -rw-r--r-- | qobject/qdict.c (renamed from qdict.c) | 0 | ||||
| -rw-r--r-- | qobject/qerror.c (renamed from qerror.c) | 0 | ||||
| -rw-r--r-- | qobject/qfloat.c (renamed from qfloat.c) | 0 | ||||
| -rw-r--r-- | qobject/qint.c (renamed from qint.c) | 0 | ||||
| -rw-r--r-- | qobject/qjson.c (renamed from qjson.c) | 0 | ||||
| -rw-r--r-- | qobject/qlist.c (renamed from qlist.c) | 0 | ||||
| -rw-r--r-- | qobject/qstring.c (renamed from qstring.c) | 0 | ||||
| -rw-r--r-- | tests/Makefile | 14 |
15 files changed, 14 insertions, 22 deletions
@@ -206,7 +206,7 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) -qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a +qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(qapi-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a $(call LINK, $^) clean: diff --git a/Makefile.objs b/Makefile.objs index 3b777c822e..d412d8c6a8 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 diff --git a/qobject/Makefile.objs b/qobject/Makefile.objs new file mode 100644 index 0000000000..c9ff59c6cc --- /dev/null +++ b/qobject/Makefile.objs @@ -0,0 +1,3 @@ +util-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o +util-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o +util-obj-y += qerror.o diff --git a/json-lexer.c b/qobject/json-lexer.c index 440df60392..440df60392 100644 --- a/json-lexer.c +++ b/qobject/json-lexer.c diff --git a/json-parser.c b/qobject/json-parser.c index 05279c11eb..05279c11eb 100644 --- a/json-parser.c +++ b/qobject/json-parser.c diff --git a/json-streamer.c b/qobject/json-streamer.c index 1b2f9b1d10..1b2f9b1d10 100644 --- a/json-streamer.c +++ b/qobject/json-streamer.c diff --git a/qbool.c b/qobject/qbool.c index a3d2afa827..a3d2afa827 100644 --- a/qbool.c +++ b/qobject/qbool.c diff --git a/qdict.c b/qobject/qdict.c index 7543ccc10f..7543ccc10f 100644 --- a/qdict.c +++ b/qobject/qdict.c diff --git a/qerror.c b/qobject/qerror.c index 3aee1cf6a6..3aee1cf6a6 100644 --- a/qerror.c +++ b/qobject/qerror.c diff --git a/qfloat.c b/qobject/qfloat.c index 7de0992dba..7de0992dba 100644 --- a/qfloat.c +++ b/qobject/qfloat.c diff --git a/qint.c b/qobject/qint.c index 86b9b04f0b..86b9b04f0b 100644 --- a/qint.c +++ b/qobject/qint.c diff --git a/qjson.c b/qobject/qjson.c index 83a6b4f7c1..83a6b4f7c1 100644 --- a/qjson.c +++ b/qobject/qjson.c diff --git a/qlist.c b/qobject/qlist.c index 1ced0de58e..1ced0de58e 100644 --- a/qlist.c +++ b/qobject/qlist.c diff --git a/qstring.c b/qobject/qstring.c index 5f7376c336..5f7376c336 100644 --- a/qstring.c +++ b/qobject/qstring.c diff --git a/tests/Makefile b/tests/Makefile index a398b4afb9..837f769433 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -70,17 +70,17 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \ tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \ tests/test-qmp-commands.o tests/test-visitor-serialization.o -test-qapi-obj-y = $(qobject-obj-y) $(qapi-obj-y) +test-qapi-obj-y = $(qapi-obj-y) test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests -tests/check-qint$(EXESUF): tests/check-qint.o qint.o -tests/check-qstring$(EXESUF): tests/check-qstring.o qstring.o -tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o -tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o -tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o -tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) libqemuutil.a libqemustub.a +tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a +tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a +tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a +tests/check-qlist$(EXESUF): tests/check-qlist.o libqemuutil.a +tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a +tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) libqemuutil.a libqemustub.a |