From f9a7ef7bec9218e3557589e09cb04e9ce87e7580 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 14 Aug 2019 09:19:22 -0700
Subject: [PATCH] mk: move log_rpc from inside log

The log_rpc library has several dependencies which depend upon the log
library. This creates a circular dependency chain that makes single
threaded make unwieldy and makes multi-threaded make impossible.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465192 (master)

(cherry picked from commit 9d1e4260cbeb9836a2e16ea2bb529f1cf31501d1)
Change-Id: I35e6532afcabce0f25974ed97444a56975654904
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466970
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/Makefile                       | 4 ++--
 lib/log/Makefile                   | 2 --
 lib/{log/rpc => log_rpc}/Makefile  | 2 +-
 lib/{log/rpc => log_rpc}/log_rpc.c | 0
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename lib/{log/rpc => log_rpc}/Makefile (97%)
 rename lib/{log/rpc => log_rpc}/log_rpc.c (100%)

diff --git a/lib/Makefile b/lib/Makefile
index 0c7a45f79..36f189291 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -35,8 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 DIRS-y += bdev blob blobfs conf copy event json jsonrpc \
-          log lvol net rpc sock thread trace util nvme vmd nvmf scsi ioat \
-          ut_mock iscsi notify
+          log log_rpc lvol net rpc sock thread trace util nvme vmd nvmf scsi \
+          ioat ut_mock iscsi notify
 ifeq ($(OS),Linux)
 DIRS-y += nbd ftl
 endif
diff --git a/lib/log/Makefile b/lib/log/Makefile
index 8125ebb13..73c0f55c7 100644
--- a/lib/log/Makefile
+++ b/lib/log/Makefile
@@ -40,6 +40,4 @@ ifeq ($(CONFIG_LOG_BACKTRACE),y)
 LOCAL_SYS_LIBS += -lunwind
 endif
 
-DIRS-y = rpc
-
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/log/rpc/Makefile b/lib/log_rpc/Makefile
similarity index 97%
rename from lib/log/rpc/Makefile
rename to lib/log_rpc/Makefile
index bf53a64c5..bab529484 100644
--- a/lib/log/rpc/Makefile
+++ b/lib/log_rpc/Makefile
@@ -31,7 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 C_SRCS = log_rpc.c
diff --git a/lib/log/rpc/log_rpc.c b/lib/log_rpc/log_rpc.c
similarity index 100%
rename from lib/log/rpc/log_rpc.c
rename to lib/log_rpc/log_rpc.c