Commit 42b6771f authored Nov 20, 2018 by Jim Harris Committed by Darek Stojaczyk Nov 28, 2018

build: add ALL_MODULES_* variables to spdk.modules.mk



This allows a lot of simplification to SPDK application
makefiles.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I5fa463f6369834b84a8d92e79fa7768082209d7a

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


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent 6005fdba

app/iscsi_tgt/Makefile

+2 −4

Original line number	Diff line number	Diff line
		@@ -52,15 +52,13 @@ ifeq ($(OS),Linux)
		SPDK_LIB_LIST += event_nbd nbd
		endif

		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS)
		LIBS += $(ALL_MODULES_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS)

		all : $(APP)
		@:

		$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES)
		$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(ALL_MODULES_FILES)
		$(LINK_C)

		clean :

app/nvmf_tgt/Makefile

+2 −4

Original line number	Diff line number	Diff line
		@@ -48,15 +48,13 @@ ifeq ($(OS),Linux)
		SPDK_LIB_LIST += event_nbd nbd
		endif

		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS) \
		LIBS += $(ALL_MODULES_LINKER_ARGS) \
		$(SPDK_LIB_LINKER_ARGS)

		all : $(APP)
		@:

		$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
		$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
		$(LINK_C)

		clean :

app/spdk_tgt/Makefile

+2 −4

Original line number	Diff line number	Diff line
		@@ -56,15 +56,13 @@ ifeq ($(OS),Linux)
		SPDK_LIB_LIST += event_nbd nbd
		endif

		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS) \
		LIBS += $(ALL_MODULES_LINKER_ARGS) \
		$(SPDK_LIB_LINKER_ARGS)

		all: $(APP)
		@:

		$(APP): $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
		$(APP): $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
		$(LINK_C)

		clean:

app/vhost/Makefile

+2 −4

Original line number	Diff line number	Diff line
		@@ -46,15 +46,13 @@ 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 += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS)
		LIBS += $(ALL_MODULES_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS)

		all : $(APP)
		@:

		$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES)
		$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(ALL_MODULES_FILES)
		$(LINK_C)

		clean :

examples/bdev/fio_plugin/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -45,14 +45,13 @@ LDFLAGS += -shared -rdynamic

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

		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
		LIBS += $(COPY_MODULES_LINKER_ARGS)
		LIBS += $(ALL_MODULES_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS)

		all: $(APP)
		@:

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

		clean: