d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: define SPDK_LIB_LIST to simplify building dependencies and linker args

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ia969f9e5ed01f4b58cec2559133347d836118131
This commit is contained in:
Jim Harris 2016-11-18 09:57:53 -07:00
parent 2655503ff7
commit 407b550ff4
30 changed files with 175 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/iscsi_tgt/Makefile
View File

@ -33,6 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = iscsi_tgt
@ -45,35 +46,17 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib
C_SRCS := iscsi_tgt.c
SPDK_LIBS = \
$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_iscsi.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_scsi.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_net.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_app_rpc.a \
SPDK_LIB_LIST = jsonrpc json rpc bdev_rpc bdev iscsi scsi net copy trace conf
SPDK_LIB_LIST += util log log_rpc event app_rpc
ifeq ($(CONFIG_RDMA), y)
LIBS += -libverbs -lrdmacm
endif
LIBS += -Wl,--whole-archive $(SPDK_LIBS) -Wl,--no-whole-archive
LIBS += -lcrypto $(ENV_LINKER_ARGS)
LIBS += $(ENV_LINKER_ARGS)
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcrypto
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :

38
app/nvmf_tgt/Makefile
View File

@ -33,6 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = nvmf_tgt
@ -41,43 +42,16 @@ CFLAGS += $(ENV_CFLAGS)
C_SRCS := conf.c nvmf_tgt.c nvmf_rpc.c
SPDK_LIBS = \
$(SPDK_ROOT_DIR)/build/lib/libspdk_nvmf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
# These libraries do not expose any external API, only constructors,
# so they must be linked specially to ensure they are not removed.
SPDK_WHOLE_LIBS = \
$(SPDK_ROOT_DIR)/build/lib/libspdk_app_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rpc.a \
SPDK_LIB_LIST = nvmf event log trace conf util bdev copy rpc jsonrpc json
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIBS)
LIBS += -Wl,--whole-archive $(SPDK_WHOLE_LIBS) -Wl,--no-whole-archive
ifeq ($(CONFIG_RDMA),y)
LIBS += -libverbs -lrdmacm
endif
LIBS += $(ENV_LINKER_ARGS)
$(COPY_MODULES_LINKER_ARGS) \
$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES) $(LINKER_MODULES) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
$(LINK_C)
clean :

9
examples/ioat/perf/Makefile
View File

@ -33,6 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = perf
@ -40,15 +41,13 @@ C_SRCS := perf.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
SPDK_LIB_LIST = ioat util log
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:

9
examples/ioat/verify/Makefile
View File

@ -33,6 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = verify
@ -40,15 +41,13 @@ C_SRCS := verify.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
SPDK_LIB_LIST = ioat util log
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:

5
lib/env_dpdk/env.mk
View File

@ -68,5 +68,6 @@ endif
ENV_CFLAGS = $(DPDK_INC)
ENV_CXXFLAGS = $(ENV_CFLAGS)
ENV_LIBS = $(SPDK_ROOT_DIR)/build/lib/libspdk_env_dpdk.a $(DPDK_LIB)
ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(SPDK_ROOT_DIR)/build/lib/libspdk_env_dpdk.a $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive
ENV_DPDK_FILE = $(call spdk_lib_list_to_files,env_dpdk)
ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB)
ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(ENV_LIBS) -Wl,--end-group -Wl,--no-whole-archive

7
mk/ioat.unittest.mk
View File

@ -34,18 +34,21 @@
IOAT_DIR := $(SPDK_ROOT_DIR)/lib/ioat
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
C_SRCS = $(TEST_FILE) $(OTHER_FILES)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += -lcunit $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
SPDK_LIB_LIST = log
LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)
APP = $(TEST_FILE:.c=)
all: $(APP)
$(APP) : $(OBJS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

7
mk/json.unittest.mk
View File

@ -32,10 +32,13 @@
#
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
JSON_DIR := $(SPDK_ROOT_DIR)/lib/json
JSONRPC_DIR := $(SPDK_ROOT_DIR)/lib/jsonrpc
SPDK_LIB_LIST = json log
C_SRCS = $(TEST_FILE) $(OTHER_FILES)
CFLAGS += -I$(JSON_DIR)
@ -43,13 +46,13 @@ CFLAGS += -I$(JSONRPC_DIR)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
CFLAGS += -I$(SPDK_ROOT_DIR)/test
LIBS += -lcunit
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
APP = $(TEST_FILE:.c=)
all: $(APP)
$(APP) : $(OBJS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

11
mk/nvme.libtest.mk
View File

@ -34,24 +34,23 @@
NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
C_SRCS = $(APP:%=%.c)
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
SPDK_LIB_LIST = nvme util log
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
ifeq ($(CONFIG_RDMA),y)
LIBS += -libverbs -lrdmacm
endif
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
all: $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:

8
mk/nvme.unittest.mk
View File

@ -34,22 +34,22 @@
NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
C_SRCS = $(TEST_FILE) $(OTHER_FILES)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
CFLAGS += -I$(SPDK_ROOT_DIR)/test
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
SPDK_LIB_LIST = util log nvme
LIBS += -lcunit $(SPDK_LIBS)
LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)
APP = $(TEST_FILE:.c=)
all: $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

7
mk/nvmf.unittest.mk
View File

@ -32,21 +32,22 @@
#
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
C_SRCS = $(TEST_FILE)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
CFLAGS += -I$(SPDK_ROOT_DIR)/test
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
SPDK_LIB_LIST = log
LIBS += -lcunit $(SPDK_LIBS)
LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)
APP = $(TEST_FILE:.c=)
all: $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

53
mk/spdk.app.mk Normal file
View File

@ -0,0 +1,53 @@
#
# BSD LICENSE
#
# Copyright (c) Intel Corporation.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Intel Corporation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# RPC libraries only export constructor functions, so these need to be treated
# separately and wrapped in whole-archive linker args
SPDK_RPC_LIB_LIST = $(filter %_rpc,$(SPDK_LIB_LIST))
# Currently the iscsi, net, and scsi libraries contain their respective RPC methods
# rather than breaking them out into separate libraries. So we must also include
# these directories in the RPC library list.
SPDK_RPC_LIB_LIST += $(filter iscsi,$(SPDK_LIB_LIST))
SPDK_RPC_LIB_LIST += $(filter net,$(SPDK_LIB_LIST))
SPDK_RPC_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST))
SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_RPC_LIB_LIST),$(SPDK_LIB_LIST))
SPDK_LIB_FILES = $(call spdk_lib_list_to_files,$(SPDK_LIB_LIST))
SPDK_LIB_LINKER_ARGS = \
-L$(SPDK_ROOT_DIR)/build/lib \
-Wl,--whole-archive \
$(SPDK_RPC_LIB_LIST:%=-lspdk_%) \
-Wl,--no-whole-archive \
$(SPDK_REMAINING_LIB_LIST:%=-lspdk_%)

4
mk/spdk.common.mk
View File

@ -153,3 +153,7 @@ CLEAN_C=\
$(COMPILE_CXX)
%.d: ;
define spdk_lib_list_to_files
$(1:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a)
endef

2
mk/spdk.lib.mk
View File

@ -33,7 +33,7 @@
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
LIB := $(SPDK_ROOT_DIR)/build/lib/libspdk_$(LIBNAME).a
LIB := $(call spdk_lib_list_to_files,$(LIBNAME))
.PHONY: all clean $(DIRS-y)

22
mk/spdk.modules.mk
View File

@ -1,27 +1,31 @@
BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_malloc.a
BLOCKDEV_MODULES_LIST = bdev_malloc bdev_nvme nvme
BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_nvme.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a
ifeq ($(CONFIG_RDMA),y)
BLOCKDEV_MODULES_DEPS += -libverbs -lrdmacm
endif
ifeq ($(OS),Linux)
BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_aio.a
BLOCKDEV_MODULES_LIST += bdev_aio
BLOCKDEV_MODULES_DEPS += -laio
endif
ifeq ($(CONFIG_RBD),y)
BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rbd.a
BLOCKDEV_MODULES_LIST += bdev_rbd
BLOCKDEV_MODULES_DEPS += -lrados -lrbd
endif
COPY_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_copy_ioat.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a
COPY_MODULES_LIST = copy_ioat ioat
BLOCKDEV_MODULES_LINKER_ARGS = -Wl,--whole-archive \
$(BLOCKDEV_MODULES) \
$(BLOCKDEV_MODULES_LIST:%=-lspdk_%) \
-Wl,--no-whole-archive \
$(BLOCKDEV_MODULES_DEPS)
BLOCKDEV_MODULES_FILES = $(call spdk_lib_list_to_files,$(BLOCKDEV_MODULES_LIST))
COPY_MODULES_LINKER_ARGS = -Wl,--whole-archive \
$(COPY_MODULES) \
$(COPY_MODULES_LIST:%=-lspdk_%) \
-Wl,--no-whole-archive \
$(COPY_MODULES_DEPS)
COPY_MODULES_FILES = $(call spdk_lib_list_to_files,$(COPY_MODULES_LIST))

20
test/lib/bdev/bdevio/Makefile
View File

@ -33,6 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdevio
@ -41,29 +42,16 @@ C_SRCS := bdevio.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
SPDK_LIB_LIST = bdev copy event trace log conf util rpc jsonrpc json
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS)
ifeq ($(CONFIG_RDMA), y)
LIBS += -libverbs -lrdmacm
endif
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS) -lcunit
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) -lcunit
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(BLOCKDEV_MODULES) $(LINKER_MODULES) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
$(LINK_C)
clean :

20
test/lib/bdev/bdevperf/Makefile
View File

@ -33,6 +33,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdevperf
@ -41,29 +42,16 @@ C_SRCS := bdevperf.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
SPDK_LIB_LIST = bdev copy event trace log conf util rpc jsonrpc json
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS)
ifeq ($(CONFIG_RDMA), y)
LIBS += -libverbs -lrdmacm
endif
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(BLOCKDEV_MODULES) $(COPY_MODULES) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(ENV_LIBS)
$(LINK_C)
clean :

11
test/lib/event/event/Makefile
View File

@ -32,23 +32,20 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
APP = event
C_SRCS := event.c
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
SPDK_LIB_LIST = event trace conf util log
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :

11
test/lib/event/reactor/Makefile
View File

@ -32,23 +32,20 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
APP = reactor
C_SRCS := reactor.c
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
SPDK_LIB_LIST = event trace conf util log
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :

11
test/lib/event/subsystem/Makefile
View File

@ -33,22 +33,19 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/event
APP = subsystem_ut
C_SRCS := subsystem_ut.c
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
SPDK_LIB_LIST = event trace conf util log
LIBS += $(SPDK_LIBS) -lcunit
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS)
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean :

9
test/lib/iscsi/param/Makefile
View File

@ -33,15 +33,14 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
SPDK_LIB_LIST = log util cunit
CFLAGS += $(DPDK_INC)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = param_ut
@ -49,7 +48,7 @@ C_SRCS = param_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

10
test/lib/iscsi/target_node/Makefile
View File

@ -33,16 +33,14 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
SPDK_LIB_LIST = log conf util cunit
CFLAGS += $(DPDK_INC)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = target_node_ut
@ -50,7 +48,7 @@ C_SRCS = target_node_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

7
test/lib/json/jsoncat/Makefile
View File

@ -33,18 +33,19 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = jsoncat
C_SRCS = jsoncat.c
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_json.a
SPDK_LIB_LIST = json
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

3
test/lib/jsonrpc/server/Makefile
View File

@ -35,7 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
TEST_FILE = jsonrpc_server_ut.c
LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
include $(SPDK_ROOT_DIR)/mk/json.unittest.mk

8
test/lib/nvmf/nvmf/Makefile
View File

@ -34,13 +34,9 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
CFLAGS += $(ENV_CFLAGS)
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/bulid/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
LIBS += $(SPDK_LIBS)
NVMF_UT_LIB_LIST = log conf util trace event
LIBS += $(call spdk_lib_list_to_files,$(NVMF_UT_LIB_LIST))
TEST_FILE = nvmf_ut.c

7
test/lib/scsi/dev/Makefile
View File

@ -33,11 +33,12 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
SPDK_LIB_LIST = log
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = dev_ut
@ -45,7 +46,7 @@ C_SRCS = dev_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

10
test/lib/scsi/init/Makefile
View File

@ -33,15 +33,13 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a
SPDK_LIB_LIST = log conf trace util
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
LIBS += -lcunit
APP = init_ut
@ -49,7 +47,7 @@ C_SRCS = init_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS) $(ENV_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:

8
test/lib/scsi/lun/Makefile
View File

@ -33,13 +33,13 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
SPDK_LIB_LIST = cunit log
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = lun_ut
@ -47,7 +47,7 @@ C_SRCS = lun_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

9
test/lib/scsi/scsi_bdev/Makefile
View File

@ -33,14 +33,13 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
SPDK_LIB_LIST = log util cunit
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = scsi_bdev_ut
@ -48,7 +47,7 @@ C_SRCS = scsi_bdev_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

8
test/lib/scsi/scsi_nvme/Makefile
View File

@ -32,13 +32,13 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
SPDK_LIB_LIST = log cunit
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = scsi_nvme_ut
@ -46,7 +46,7 @@ C_SRCS = scsi_nvme_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:

8
test/lib/util/io_channel/Makefile
View File

@ -33,14 +33,14 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
SPDK_LIB_LIST = log cunit
CFLAGS += $(DPDK_INC)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIBS)
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = io_channel_ut
@ -48,7 +48,7 @@ C_SRCS = $(APP).c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean: