Commit 5704be89 authored by Jim Harris's avatar Jim Harris
Browse files

build: remove xx_MODULES_LINKER_ARGS and xx_MODULES_FILES 



Application Makefiles can now just add xx_MODULES_LIB_LIST
to SPDK_LIB_LIST.  This is possible now since all
SPDK libraries are linked with --whole-archive, so there
is no need to differentiate between "modules" libraries
and other SPDK libraries.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Iabf81a388b72d3b2a2f48287a8491ddc977722ac

Reviewed-on: https://review.gerrithub.io/434277


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 0cc8f762

app/iscsi_tgt/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib 


C_SRCS := iscsi_tgt.c



SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event

SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf

SPDK_LIB_LIST += thread util log log_rpc app_rpc net sock
@@ -52,13 +53,12 @@ ifeq ($(OS),Linux) 
SPDK_LIB_LIST += event_nbd nbd

endif



LIBS += $(ALL_MODULES_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(ALL_MODULES_FILES)

$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean :

app/nvmf_tgt/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ APP = nvmf_tgt 


C_SRCS := nvmf_main.c



SPDK_LIB_LIST = event_bdev event_copy event_nvmf

SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += event_bdev event_copy event_nvmf

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

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
@@ -48,13 +49,12 @@ ifeq ($(OS),Linux) 
SPDK_LIB_LIST += event_nbd nbd

endif



LIBS += $(ALL_MODULES_LINKER_ARGS) \

	$(SPDK_LIB_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS)

$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean :

app/spdk_tgt/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ APP = spdk_tgt 


C_SRCS := spdk_tgt.c



SPDK_LIB_LIST =

SPDK_LIB_LIST = $(ALL_MODULES_LIST)



ifeq ($(OS),Linux)

ifeq ($(CONFIG_VHOST),y)
@@ -56,13 +56,12 @@ ifeq ($(OS),Linux) 
SPDK_LIB_LIST += event_nbd nbd

endif



LIBS += $(ALL_MODULES_LINKER_ARGS) \

	$(SPDK_LIB_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)



all: $(APP)

	@:



$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS)

$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean:

app/vhost/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -40,19 +40,19 @@ APP = vhost 


C_SRCS := vhost.c



SPDK_LIB_LIST = vhost rte_vhost event_vhost

SPDK_LIB_LIST = $(ALL_MODULES_LIST)

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 += event_nbd nbd net sock



LIBS += $(ALL_MODULES_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(ALL_MODULES_FILES)

$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean :

examples/bdev/fio_plugin/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -43,15 +43,15 @@ C_SRCS = fio_plugin.c 
CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR)

LDFLAGS += -shared -rdynamic



SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace



LIBS += $(ALL_MODULES_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)



all: $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(ALL_MODULES_FILES)

$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean: