[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build |
Date: |
Tue, 19 Sep 2017 18:52:01 +0200 |
And actually link to it from vhost-user-bridge.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
Makefile | 3 ++-
tests/Makefile.include | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index b53fc69a60..8a64b6afb0 100644
--- a/Makefile
+++ b/Makefile
@@ -336,7 +336,7 @@ dtc/%:
mkdir -p $@
$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \
- $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
+ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) libvhost-user.a
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
# Only keep -O and -g cflags
@@ -357,6 +357,7 @@ Makefile: $(version-obj-y)
libqemustub.a: $(stub-obj-y)
libqemuutil.a: $(util-obj-y) $(trace-obj-y)
+libvhost-user.a: $(libvhost-user-obj-y)
######################################################################
diff --git a/tests/Makefile.include b/tests/Makefile.include
index fae5715e9c..367d144275 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -795,7 +795,7 @@ tests/test-filter-redirector$(EXESUF):
tests/test-filter-redirector.o $(qtest-ob
tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o
$(qtest-obj-y)
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o
contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y)
$(libqos-pc-obj-y)
-tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
contrib/libvhost-user/libvhost-user.o $(test-util-obj-y)
+tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y)
libvhost-user.a
tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup(), Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup, Marc-André Lureau, 2017/09/19