summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-09-02 11:18:16 +0100
committerDaniel P. Berrange <berrange@redhat.com>2015-09-15 14:35:39 +0100
commit0c7012e0558e4312e575fd4c70652d8ef2265ff7 (patch)
tree94301efe545752426e5bab1a6f18abab31af3a4f /tests
parentfb37726db77b21f3731b90693d2c93ade1777528 (diff)
downloadhqemu-0c7012e0558e4312e575fd4c70652d8ef2265ff7.zip
hqemu-0c7012e0558e4312e575fd4c70652d8ef2265ff7.tar.gz
qom: allow QOM to be linked into tools binaries
The qom objects are currently added to common-obj-y which is only linked into the system emulators. The later crypto patches will depend on QOM infrastructure and will also be used from tools binaries. Thus the QOM objects are moved into a new qom-obj-y variable which can be referenced when linking tools, system emulators and tests. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile
index d77ccee..ddd5148 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -284,9 +284,7 @@ QEMU_CFLAGS += -I$(SRC_PATH)/tests
# Deps that are common to various different sets of tests below
test-util-obj-y = libqemuutil.a libqemustub.a
-test-qom-obj-y = qom/object.o qom/qom-qobject.o \
- qom/container.o qom/object_interfaces.o \
- $(test-util-obj-y)
+test-qom-obj-y = $(qom-obj-y) $(test-util-obj-y)
test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \
tests/test-qapi-event.o \
$(test-qom-obj-y)
OpenPOWER on IntegriCloud