Commit d132ee35 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

build: use DEPDIRS variables to build SPDK_LIB_LIST 



All of our Makefiles duplicate huge lists of libraries
in SPDK_LIB_LIST.  We have a very precise and accurate
accounting of the library dependencies in
mk/spdk.lib_deps.mk which can be used to generate
the full list if the app specifies the modules and
subsystem libraries it wishes to link.

I did a first pass through all of the existing
Makefiles to take advantage of this new functionality.
There may be more optimizations we can make later but
don't want to hold up this patch for all of them.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Icdaf6f749a6908df2c2ce2db22631a4af4ff3a9e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5553


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 27c2daff

app/iscsi_tgt/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -43,17 +43,14 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib 


C_SRCS := iscsi_tgt.c



SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event

SPDK_LIB_LIST += jsonrpc json rpc bdev iscsi scsi accel trace conf

SPDK_LIB_LIST += thread util log net sock notify

SPDK_LIB_LIST = $(ALL_MODULES_LIST) event_iscsi event_net



ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))

SPDK_LIB_LIST += env_dpdk_rpc

endif



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

SPDK_LIB_LIST += event_nbd

endif



include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

app/iscsi_top/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk 


APP = iscsi_top



SPDK_LIB_LIST = jsonrpc json rpc log util

SPDK_LIB_LIST = rpc



CFLAGS += -I$(SPDK_ROOT_DIR)/lib

app/nvmf_tgt/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -39,17 +39,14 @@ APP = nvmf_tgt 


C_SRCS := nvmf_main.c



SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_nvmf event_net

SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json net sock

SPDK_LIB_LIST += notify

SPDK_LIB_LIST = $(ALL_MODULES_LIST) event_nvmf



ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))

SPDK_LIB_LIST += env_dpdk_rpc

endif



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

SPDK_LIB_LIST += event_nbd

endif



ifeq ($(CONFIG_FC),y)

app/spdk_dd/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ APP = spdk_dd 


C_SRCS := spdk_dd.c



SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += event_sock event_bdev event_accel event_vmd

SPDK_LIB_LIST += bdev accel event thread util conf trace \

		log jsonrpc json rpc sock notify

SPDK_LIB_LIST = $(ALL_MODULES_LIST) event_bdev



include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

app/spdk_lspci/Makefile

+1 −9
Original line number Diff line number Diff line
@@ -38,14 +38,6 @@ APP = spdk_lspci 


C_SRCS := spdk_lspci.c



SPDK_LIB_LIST = $(SOCK_MODULES_LIST)

SPDK_LIB_LIST += nvme thread util log sock vmd jsonrpc json rpc



ifeq ($(CONFIG_RDMA),y)

SPDK_LIB_LIST += rdma

ifeq ($(CONFIG_RDMA_PROV),mlx5_dv)

SYS_LIBS += -lmlx5

endif

endif

SPDK_LIB_LIST = $(SOCK_MODULES_LIST) nvme vmd



include $(SPDK_ROOT_DIR)/mk/spdk.app.mk