From 0cc8f76225178d50711c8cd18e8bc1a2a1b92dd2 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 20 Nov 2018 14:20:50 -0700 Subject: [PATCH] build: remove unused LINKER_MODULES Signed-off-by: Jim Harris Change-Id: I944a2cd3fb646ce96c58412c72fdd299651ca148 Reviewed-on: https://review.gerrithub.io/434276 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto --- app/nvmf_tgt/Makefile | 2 +- app/spdk_tgt/Makefile | 2 +- examples/bdev/hello_world/Makefile | 2 +- examples/blob/cli/Makefile | 2 +- examples/blob/hello_world/Makefile | 2 +- examples/sock/hello_world/Makefile | 2 +- test/app/bdev_svc/Makefile | 2 +- test/bdev/bdevio/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index 52cac476d..cacf9690b 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -54,7 +54,7 @@ LIBS += $(ALL_MODULES_LINKER_ARGS) \ all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile index 38af39190..58e564325 100644 --- a/app/spdk_tgt/Makefile +++ b/app/spdk_tgt/Makefile @@ -62,7 +62,7 @@ LIBS += $(ALL_MODULES_LINKER_ARGS) \ all: $(APP) @: -$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean: diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile index 5bd27690b..4c4c584d6 100644 --- a/examples/bdev/hello_world/Makefile +++ b/examples/bdev/hello_world/Makefile @@ -47,7 +47,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile index 6670b06fb..5a01aa26e 100644 --- a/examples/blob/cli/Makefile +++ b/examples/blob/cli/Makefile @@ -51,7 +51,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile index 6bcf61216..8618ffe05 100644 --- a/examples/blob/hello_world/Makefile +++ b/examples/blob/hello_world/Makefile @@ -48,7 +48,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/sock/hello_world/Makefile b/examples/sock/hello_world/Makefile index 4e6ba2d5d..b04d2c15d 100644 --- a/examples/sock/hello_world/Makefile +++ b/examples/sock/hello_world/Makefile @@ -45,7 +45,7 @@ LIBS += $(SOCK_MODULES_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SOCK_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index 30eb23302..963ec7aec 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -54,7 +54,7 @@ LIBS += $(ALL_MODULES_LINKER_ARGS) \ all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile index 259129f36..fe304d574 100644 --- a/test/bdev/bdevio/Makefile +++ b/test/bdev/bdevio/Makefile @@ -50,7 +50,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ALL_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean :