From ec02743a4c0c1972a26f3c5d484229421628a0a5 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Wed, 30 Sep 2020 15:31:38 +0000
Subject: [PATCH] build: add ufc to SYS_LIBS in spdk.common.mk

This avoids duplicating it in several different
Makefiles.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I85f4886ec6744c23639d24867e2c68757dfeba32
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4484
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: <dongx.yi@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
---
 app/nvmf_tgt/Makefile       | 7 -------
 app/spdk_tgt/Makefile       | 7 -------
 examples/nvmf/nvmf/Makefile | 7 -------
 mk/spdk.common.mk           | 7 +++++++
 test/app/bdev_svc/Makefile  | 7 -------
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index ed3780cb28..a27d57ac54 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -49,11 +49,4 @@ ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd
 endif
 
-ifeq ($(CONFIG_FC),y)
-ifneq ($(strip $(CONFIG_FC_PATH)),)
-SYS_LIBS += -L$(CONFIG_FC_PATH)
-endif
-SYS_LIBS += -lufc
-endif
-
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index 446ba8234e..91d590aa78 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -54,13 +54,6 @@ SPDK_LIB_LIST += event_vhost
 endif
 endif
 
-ifeq ($(CONFIG_FC),y)
-ifneq ($(strip $(CONFIG_FC_PATH)),)
-SYS_LIBS += -L$(CONFIG_FC_PATH)
-endif
-SYS_LIBS += -lufc
-endif
-
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 install: $(APP)
diff --git a/examples/nvmf/nvmf/Makefile b/examples/nvmf/nvmf/Makefile
index e12170a36f..4db21ca82d 100644
--- a/examples/nvmf/nvmf/Makefile
+++ b/examples/nvmf/nvmf/Makefile
@@ -40,11 +40,4 @@ APP := nvmf
 C_SRCS := nvmf.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST) event_bdev nvmf
 
-ifeq ($(CONFIG_FC),y)
-ifneq ($(strip $(CONFIG_FC_PATH)),)
-SYS_LIBS += -L$(CONFIG_FC_PATH)
-endif
-SYS_LIBS += -lufc
-endif
-
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index 2b97bf689f..6e8c098659 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -182,6 +182,13 @@ endif
 endif
 endif
 
+ifeq ($(CONFIG_FC),y)
+ifneq ($(strip $(CONFIG_FC_PATH)),)
+SYS_LIBS += -L$(CONFIG_FC_PATH)
+endif
+SYS_LIBS += -lufc
+endif
+
 ifeq ($(CONFIG_DEBUG), y)
 COMMON_CFLAGS += -DDEBUG -O0 -fno-omit-frame-pointer
 else
diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile
index 9cc3627014..9e560de0f8 100644
--- a/test/app/bdev_svc/Makefile
+++ b/test/app/bdev_svc/Makefile
@@ -45,11 +45,4 @@ ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd
 endif
 
-ifeq ($(CONFIG_FC),y)
-ifneq ($(strip $(CONFIG_FC_PATH)),)
-SYS_LIBS += -L$(CONFIG_FC_PATH)
-endif
-SYS_LIBS += -lufc
-endif
-
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk