aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2017-09-19 17:25:04 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2017-10-10 23:31:08 +0200
commitd59a031c7e6424ba302af00346b55e8318613719 (patch)
tree9e3d3f26fbeabe524ca6c483c08eb74151011535
parentde97cdede39f74136e57ec1fd293e4e49d4bc34c (diff)
build-sys: make vhost-user-scsi depend on libvhost-user.a
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--Makefile2
-rw-r--r--Makefile.objs1
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 64d3a9e244..97b4508d7d 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 =