From 4ace96533d1bb20836112ee699ef40db92e7076b Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Thu, 18 Aug 2016 16:06:00 -0700
Subject: [PATCH] nvmf_tgt: build even if RDMA is disabled

Build the now-generic nvmf_tgt app regardless of whether the RDMA
libraries are available.

The nvmf_tgt app Makefile still has to add the RDMA libraries to the
linker command, but otherwise it does not need to know anything about
the avilable transports.

Change-Id: Ibeeac5ed998be1eb12a673a1340893dbb53110b7
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 app/Makefile          | 2 +-
 app/nvmf_tgt/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Makefile b/app/Makefile
index 94e067e36..585249201 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 DIRS-y += trace
-DIRS-$(CONFIG_RDMA) += nvmf_tgt
+DIRS-y += nvmf_tgt
 ifeq ($(OS),Linux)
 DIRS-y += iscsi_tgt
 endif
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index d4fe20d7b..9cc122f91 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -67,7 +67,10 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 
 LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB)
 
+ifeq ($(CONFIG_RDMA),y)
 LIBS += -libverbs -lrdmacm
+endif
+
 LIBS += $(DPDK_LIB)
 
 all : $(APP)