update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / spdk / app / nvmf_tgt / Makefile

diff --git a/ceph/src/spdk/app/nvmf_tgt/Makefile b/ceph/src/spdk/app/nvmf_tgt/Makefile
index ef044e40a6574563ec177f471755e2e56bdee793..e93ed1bf0c9cb2dfd325191d370decba083a5415 100644 (file)
--- a/ceph/src/spdk/app/nvmf_tgt/Makefile
+++ b/ceph/src/spdk/app/nvmf_tgt/Makefile
@@ -38,20 +38,25 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = nvmf_tgt
 
-CFLAGS += $(ENV_CFLAGS)
+C_SRCS := nvmf_main.c
 
-C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c
-
-SPDK_LIB_LIST = nvmf event log trace conf util bdev copy rpc jsonrpc json
+SPDK_LIB_LIST = event_bdev event_copy event_nvmf
+SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json
 SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
 
+ifeq ($(OS),Linux)
+SPDK_LIB_LIST += event_nbd nbd
+endif
+
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
        $(COPY_MODULES_LINKER_ARGS) \
+       $(SOCK_MODULES_LINKER_ARGS) \
        $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
 
 all : $(APP)
+       @:
 
-$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
+$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
        $(LINK_C)
 
 clean :