[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/27] build-sys: make vhost-user-scsi depend on libv
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a |
Date: |
Tue, 10 Oct 2017 19:10:58 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
Makefile | 2 +-
Makefile.objs | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index a0fe721c5b..c2ee765659 100644
--- a/Makefile
+++ b/Makefile
@@ -480,7 +480,7 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y)
$(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)
+vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
$(call LINK, $^)
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
diff --git a/Makefile.objs b/Makefile.objs
index bdfa3b6177..d4f973a8fc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -115,7 +115,6 @@ libvhost-user-obj-y = contrib/libvhost-user/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
-vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o
######################################################################
trace-events-subdirs =
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PULL 00/27] vhost-user patches, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a,
Marc-André Lureau <=
- [Qemu-devel] [PULL 02/27] build-sys: fix libvhost-user.a build, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 05/27] libvhost-user: improve vu_queue_pop() doc, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 04/27] libvhost-user: drop dependency on glib, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 08/27] vhost-user-scsi: code style fixes, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 06/27] vhost-user-scsi: use g_strdup(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 07/27] vhost-user-scsi: connect unix socket before allocating, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 09/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 10/27] vhost-user-scsi: glib calls that allocate don't return NULL, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 11/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/10/10