diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile index ad7e03e38..cfb1bb3ad 100644 --- a/app/spdk_tgt/Makefile +++ b/app/spdk_tgt/Makefile @@ -40,17 +40,20 @@ APP = spdk_tgt C_SRCS := spdk_tgt.c -SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event +SPDK_LIB_LIST = + +ifeq ($(OS),Linux) +ifeq ($(CONFIG_VHOST),y) +SPDK_LIB_LIST += vhost rte_vhost event_vhost +endif +endif + +SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net ifeq ($(OS),Linux) SPDK_LIB_LIST += event_nbd nbd - -ifeq ($(CONFIG_VHOST),y) -SPDK_LIB_LIST += vhost rte_vhost event_vhost -endif - endif LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ diff --git a/app/vhost/Makefile b/app/vhost/Makefile index ef75e5e31..51437ac2e 100644 --- a/app/vhost/Makefile +++ b/app/vhost/Makefile @@ -40,10 +40,11 @@ APP = vhost C_SRCS := vhost.c -SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost event +SPDK_LIB_LIST = vhost rte_vhost event_vhost +SPDK_LIB_LIST += event_bdev event_copy event_net event_scsi event SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf SPDK_LIB_LIST += thread util log log_rpc app_rpc -SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd net +SPDK_LIB_LIST += event_nbd nbd net LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \