Commit 0b5fa082 authored by Jim Harris's avatar Jim Harris Committed by Darek Stojaczyk
Browse files

build: remove sock from SOCK_MODULES_LIST 



The various *_MODULES_LIST are intended for the modules
that implement the specific interface - not for the
associated core library itself.

For example, BLOCKDEV_MODULES_LIST doesn't contain bdev,
it contains all of the bdev modules.  Similar for
COPY_MODULES_LIST and copy.

So make SOCK_MODULES_LIST consistent.  This is a real
pain because we have to add sock explicitly to a bunch
of individual Makefiles, but I have plans to clean that
up in some future patches.

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

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


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 2bebd09b

app/iscsi_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c 


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

SPDK_LIB_LIST += thread util log log_rpc app_rpc net sock



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

app/nvmf_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ APP = nvmf_tgt 
C_SRCS := nvmf_main.c



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 += nvmf event log trace conf thread util bdev copy rpc jsonrpc json sock

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc



ifeq ($(OS),Linux)

app/spdk_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ endif 


SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event

SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net sock



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

app/vhost/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 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

SPDK_LIB_LIST += event_nbd nbd net sock



LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

	$(COPY_MODULES_LINKER_ARGS) \

examples/bdev/hello_world/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ APP = hello_bdev 
C_SRCS := hello_bdev.c



SPDK_LIB_LIST = event_bdev event_copy

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

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



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

LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)