diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index a5757097f4..c077c46cf2 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -46,22 +46,22 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 C_SRCS := iscsi_tgt.c
 
 SPDK_LIBS = \
-	$(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \
-	$(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
-	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
-	$(SPDK_ROOT_DIR)/lib/bdev/rpc/libspdk_bdev_rpc.a \
-	$(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
-	$(SPDK_ROOT_DIR)/lib/iscsi/libspdk_iscsi.a \
-	$(SPDK_ROOT_DIR)/lib/scsi/libspdk_scsi.a \
-	$(SPDK_ROOT_DIR)/lib/net/libspdk_net.a \
-	$(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \
-	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \
-	$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	$(SPDK_ROOT_DIR)/lib/event/rpc/libspdk_app_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_iscsi.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_scsi.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_net.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_log_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_app_rpc.a \
 
 LIBS += -Wl,--whole-archive $(SPDK_LIBS) -Wl,--no-whole-archive
 LIBS += -lcrypto $(ENV_LINKER_ARGS)
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index 0dd4a09d25..8ef5489e31 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -42,25 +42,25 @@ CFLAGS += $(ENV_CFLAGS)
 C_SRCS := conf.c nvmf_tgt.c nvmf_rpc.c
 
 SPDK_LIBS = \
-	$(SPDK_ROOT_DIR)/lib/nvmf/libspdk_nvmf.a \
-	$(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	$(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
-	$(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \
-	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
-	$(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
-	$(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_nvmf.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
 
 # These libraries do not expose any external API, only constructors,
 # so they must be linked specially to ensure they are not removed.
 SPDK_WHOLE_LIBS = \
-	$(SPDK_ROOT_DIR)/lib/event/rpc/libspdk_app_rpc.a \
-	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \
-	$(SPDK_ROOT_DIR)/lib/bdev/rpc/libspdk_bdev_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_app_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_log_rpc.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rpc.a \
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
         $(COPY_MODULES_LINKER_ARGS)
diff --git a/build/lib/.gitignore b/build/lib/.gitignore
new file mode 100644
index 0000000000..dcf2c804da
--- /dev/null
+++ b/build/lib/.gitignore
@@ -0,0 +1 @@
+# Placeholder
diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile
index 750186d0f8..113f0e24e6 100644
--- a/examples/ioat/perf/Makefile
+++ b/examples/ioat/perf/Makefile
@@ -40,9 +40,9 @@ C_SRCS := perf.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile
index 875b9ee710..61cfd99f7e 100644
--- a/examples/ioat/verify/Makefile
+++ b/examples/ioat/verify/Makefile
@@ -40,9 +40,9 @@ C_SRCS := verify.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/arbitration/Makefile b/examples/nvme/arbitration/Makefile
index 6c97710521..a3c6c93fbb 100644
--- a/examples/nvme/arbitration/Makefile
+++ b/examples/nvme/arbitration/Makefile
@@ -40,9 +40,9 @@ C_SRCS := arbitration.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/fio_plugin/Makefile b/examples/nvme/fio_plugin/Makefile
index 4d2bd873a8..64384cd9cc 100644
--- a/examples/nvme/fio_plugin/Makefile
+++ b/examples/nvme/fio_plugin/Makefile
@@ -44,9 +44,9 @@ CFLAGS += -I. $(ENV_CFLAGS) -I$(FIO_SOURCE_DIR)
 
 LDFLAGS += -shared -rdynamic
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/hello_world/Makefile b/examples/nvme/hello_world/Makefile
index ba9aee6226..f097134c5b 100644
--- a/examples/nvme/hello_world/Makefile
+++ b/examples/nvme/hello_world/Makefile
@@ -40,9 +40,9 @@ C_SRCS := hello_world.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile
index 73ed11d8f5..66a293bb66 100644
--- a/examples/nvme/identify/Makefile
+++ b/examples/nvme/identify/Makefile
@@ -40,9 +40,9 @@ C_SRCS := identify.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/nvme_manage/Makefile b/examples/nvme/nvme_manage/Makefile
index a8db42b923..0ef5bdae05 100644
--- a/examples/nvme/nvme_manage/Makefile
+++ b/examples/nvme/nvme_manage/Makefile
@@ -40,9 +40,9 @@ C_SRCS := nvme_manage.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile
index 6beb980439..a9fa8c5ebe 100644
--- a/examples/nvme/perf/Makefile
+++ b/examples/nvme/perf/Makefile
@@ -40,9 +40,9 @@ C_SRCS := perf.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/examples/nvme/reserve/Makefile b/examples/nvme/reserve/Makefile
index 89643e927c..99de1152ff 100644
--- a/examples/nvme/reserve/Makefile
+++ b/examples/nvme/reserve/Makefile
@@ -40,9 +40,9 @@ C_SRCS := reservation.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk
index be0e55b278..c9d7d07ace 100644
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -68,5 +68,5 @@ endif
 
 ENV_CFLAGS = $(DPDK_INC)
 ENV_CXXFLAGS = $(ENV_CFLAGS)
-ENV_LIBS = $(SPDK_ROOT_DIR)/lib/env_dpdk/libspdk_env_dpdk.a $(DPDK_LIB)
-ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(SPDK_ROOT_DIR)/lib/env_dpdk/libspdk_env_dpdk.a $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive
+ENV_LIBS = $(SPDK_ROOT_DIR)/build/lib/libspdk_env_dpdk.a $(DPDK_LIB)
+ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(SPDK_ROOT_DIR)/build/lib/libspdk_env_dpdk.a $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive
diff --git a/mk/ioat.unittest.mk b/mk/ioat.unittest.mk
index b5e630f8e0..690752cf43 100644
--- a/mk/ioat.unittest.mk
+++ b/mk/ioat.unittest.mk
@@ -39,7 +39,7 @@ C_SRCS = $(TEST_FILE) $(OTHER_FILES)
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 
-LIBS += -lcunit $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
+LIBS += -lcunit $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
 
 APP = $(TEST_FILE:.c=)
 
diff --git a/mk/nvme.unittest.mk b/mk/nvme.unittest.mk
index 0a20f0651d..d8c4781a89 100644
--- a/mk/nvme.unittest.mk
+++ b/mk/nvme.unittest.mk
@@ -40,8 +40,8 @@ C_SRCS = $(TEST_FILE) $(OTHER_FILES)
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
 
 LIBS += -lcunit $(SPDK_LIBS)
 
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index ebbae48808..e4836c62ec 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -139,7 +139,7 @@ LINK_CXX=\
 
 # Archive $(OBJS) into $@ (.a)
 LIB_C=\
-	$(Q)echo "  LIB $S/$@"; \
+	$(Q)echo "  LIB $(notdir $@)"; \
 	ar crDs $@ $(OBJS)
 
 # Clean up generated files listed as arguments plus a default list
diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk
index cf946fbdac..a1bcdf782c 100644
--- a/mk/spdk.lib.mk
+++ b/mk/spdk.lib.mk
@@ -33,14 +33,14 @@
 
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-LIB := libspdk_$(LIBNAME).a
+LIB := $(SPDK_ROOT_DIR)/build/lib/libspdk_$(LIBNAME).a
 
 .PHONY: all clean $(DIRS-y)
 
 all: $(LIB) $(DIRS-y)
 
 clean: $(DIRS-y)
-	$(CLEAN_C)
+	$(CLEAN_C) $(LIB)
 
 $(LIB): $(OBJS)
 	$(LIB_C)
diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk
index 5cb242543b..25d9963e30 100644
--- a/mk/spdk.modules.mk
+++ b/mk/spdk.modules.mk
@@ -1,20 +1,20 @@
-BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/lib/bdev/malloc/libspdk_bdev_malloc.a
+BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_malloc.a
 
-BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/lib/bdev/nvme/libspdk_bdev_nvme.a \
-		    $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a
+BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_nvme.a \
+		    $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a
 
 ifeq ($(OS),Linux)
-BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/lib/bdev/aio/libspdk_bdev_aio.a
+BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_aio.a
 BLOCKDEV_MODULES_DEPS += -laio
 endif
 
 ifeq ($(CONFIG_RBD),y)
-BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/lib/bdev/rbd/libspdk_bdev_rbd.a
+BLOCKDEV_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rbd.a
 BLOCKDEV_MODULES_DEPS += -lrados -lrbd
 endif
 
-COPY_MODULES += $(SPDK_ROOT_DIR)/lib/copy/ioat/libspdk_copy_ioat.a \
-		$(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a
+COPY_MODULES += $(SPDK_ROOT_DIR)/build/lib/libspdk_copy_ioat.a \
+		$(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a
 
 BLOCKDEV_MODULES_LINKER_ARGS = -Wl,--whole-archive \
 			       $(BLOCKDEV_MODULES) \
diff --git a/test/lib/bdev/bdevio/Makefile b/test/lib/bdev/bdevio/Makefile
index 70530bbd35..23eb93129e 100644
--- a/test/lib/bdev/bdevio/Makefile
+++ b/test/lib/bdev/bdevio/Makefile
@@ -41,16 +41,16 @@ C_SRCS := bdevio.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
-	     $(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \
-	     $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	     $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
-	     $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
-	     $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS)
diff --git a/test/lib/bdev/bdevperf/Makefile b/test/lib/bdev/bdevperf/Makefile
index cf8c7138e9..229608874c 100644
--- a/test/lib/bdev/bdevperf/Makefile
+++ b/test/lib/bdev/bdevperf/Makefile
@@ -41,16 +41,16 @@ C_SRCS := bdevperf.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
-	     $(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \
-	     $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	     $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
-	     $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
-	     $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS)
diff --git a/test/lib/event/event/Makefile b/test/lib/event/event/Makefile
index 93effd8522..b06db8661a 100644
--- a/test/lib/event/event/Makefile
+++ b/test/lib/event/event/Makefile
@@ -38,11 +38,11 @@ CFLAGS += $(ENV_CFLAGS)
 APP = event
 C_SRCS := event.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	     $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/event/reactor/Makefile b/test/lib/event/reactor/Makefile
index 5e127a1790..5bc0da932b 100644
--- a/test/lib/event/reactor/Makefile
+++ b/test/lib/event/reactor/Makefile
@@ -38,11 +38,11 @@ CFLAGS += $(ENV_CFLAGS)
 APP = reactor
 C_SRCS := reactor.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	     $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/event/subsystem/Makefile b/test/lib/event/subsystem/Makefile
index d4338ccce9..d96e122bb6 100644
--- a/test/lib/event/subsystem/Makefile
+++ b/test/lib/event/subsystem/Makefile
@@ -38,11 +38,11 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib/event
 APP = subsystem_ut
 C_SRCS := subsystem_ut.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
-	     $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) -lcunit
 
diff --git a/test/lib/iscsi/param/Makefile b/test/lib/iscsi/param/Makefile
index a8c307ffe9..17a5698a26 100644
--- a/test/lib/iscsi/param/Makefile
+++ b/test/lib/iscsi/param/Makefile
@@ -34,9 +34,9 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
 
 CFLAGS += $(DPDK_INC)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
diff --git a/test/lib/iscsi/target_node/Makefile b/test/lib/iscsi/target_node/Makefile
index d18918df52..abbbc7951f 100644
--- a/test/lib/iscsi/target_node/Makefile
+++ b/test/lib/iscsi/target_node/Makefile
@@ -34,10 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
 
 CFLAGS += $(DPDK_INC)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
diff --git a/test/lib/json/jsoncat/Makefile b/test/lib/json/jsoncat/Makefile
index 224ee6d778..5c5c837f0a 100644
--- a/test/lib/json/jsoncat/Makefile
+++ b/test/lib/json/jsoncat/Makefile
@@ -38,7 +38,7 @@ APP = jsoncat
 
 C_SRCS = jsoncat.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_json.a
 
 LIBS += $(SPDK_LIBS)
 
diff --git a/test/lib/jsonrpc/server/Makefile b/test/lib/jsonrpc/server/Makefile
index f3e6e02c06..cc018aea75 100644
--- a/test/lib/jsonrpc/server/Makefile
+++ b/test/lib/jsonrpc/server/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 
 TEST_FILE = jsonrpc_server_ut.c
 
-LIBS += $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \
-	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \
+	$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
diff --git a/test/lib/nvme/aer/Makefile b/test/lib/nvme/aer/Makefile
index 86332b8280..850ddc874e 100644
--- a/test/lib/nvme/aer/Makefile
+++ b/test/lib/nvme/aer/Makefile
@@ -40,9 +40,9 @@ C_SRCS := aer.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/nvme/e2edp/Makefile b/test/lib/nvme/e2edp/Makefile
index c07407d316..aa18e2b037 100644
--- a/test/lib/nvme/e2edp/Makefile
+++ b/test/lib/nvme/e2edp/Makefile
@@ -40,9 +40,9 @@ C_SRCS := nvme_dp.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/nvme/overhead/Makefile b/test/lib/nvme/overhead/Makefile
index 2e5dc5f73e..3e3627d2dd 100644
--- a/test/lib/nvme/overhead/Makefile
+++ b/test/lib/nvme/overhead/Makefile
@@ -40,9 +40,9 @@ C_SRCS := overhead.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/nvme/reset/Makefile b/test/lib/nvme/reset/Makefile
index 95250d2589..8fb681a9ba 100644
--- a/test/lib/nvme/reset/Makefile
+++ b/test/lib/nvme/reset/Makefile
@@ -40,9 +40,9 @@ C_SRCS := reset.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/nvme/sgl/Makefile b/test/lib/nvme/sgl/Makefile
index ff6bcff62f..8f176b235e 100644
--- a/test/lib/nvme/sgl/Makefile
+++ b/test/lib/nvme/sgl/Makefile
@@ -40,9 +40,9 @@ C_SRCS := nvme_sgl.c
 
 CFLAGS += -I. $(ENV_CFLAGS)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
 
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
diff --git a/test/lib/nvmf/nvmf/Makefile b/test/lib/nvmf/nvmf/Makefile
index f952b4c897..a0f970935b 100644
--- a/test/lib/nvmf/nvmf/Makefile
+++ b/test/lib/nvmf/nvmf/Makefile
@@ -34,11 +34,11 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 
 CFLAGS += $(ENV_CFLAGS)
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-             $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-             $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-             $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-             $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+             $(SPDK_ROOT_DIR)/bulid/lib/libspdk_conf.a \
+             $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+             $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+             $(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \
 
 LIBS += $(SPDK_LIBS)
 
diff --git a/test/lib/nvmf/request/Makefile b/test/lib/nvmf/request/Makefile
index ad49ce78dd..984f2bea88 100644
--- a/test/lib/nvmf/request/Makefile
+++ b/test/lib/nvmf/request/Makefile
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
 
 LIBS += $(SPDK_LIBS)
 LIBS += -lcunit
diff --git a/test/lib/nvmf/session/Makefile b/test/lib/nvmf/session/Makefile
index c6e8d5edd8..2a5b8cba78 100644
--- a/test/lib/nvmf/session/Makefile
+++ b/test/lib/nvmf/session/Makefile
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
 
 LIBS += $(SPDK_LIBS)
 LIBS += -lcunit
diff --git a/test/lib/nvmf/subsystem/Makefile b/test/lib/nvmf/subsystem/Makefile
index c2a1eed07a..d477ceb0d2 100644
--- a/test/lib/nvmf/subsystem/Makefile
+++ b/test/lib/nvmf/subsystem/Makefile
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
 
 LIBS += $(SPDK_LIBS)
 LIBS += -lcunit
diff --git a/test/lib/scsi/dev/Makefile b/test/lib/scsi/dev/Makefile
index 0ad130d618..b3f44f699f 100644
--- a/test/lib/scsi/dev/Makefile
+++ b/test/lib/scsi/dev/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
 LIBS += $(SPDK_LIBS)
diff --git a/test/lib/scsi/init/Makefile b/test/lib/scsi/init/Makefile
index 13a3678eb5..928e1780c6 100644
--- a/test/lib/scsi/init/Makefile
+++ b/test/lib/scsi/init/Makefile
@@ -34,10 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
-	     $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi $(ENV_CFLAGS)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
diff --git a/test/lib/scsi/lun/Makefile b/test/lib/scsi/lun/Makefile
index 5bb1284519..fb98894aa4 100644
--- a/test/lib/scsi/lun/Makefile
+++ b/test/lib/scsi/lun/Makefile
@@ -34,8 +34,8 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
diff --git a/test/lib/scsi/scsi_bdev/Makefile b/test/lib/scsi/scsi_bdev/Makefile
index 3c657c8906..55242c4996 100644
--- a/test/lib/scsi/scsi_bdev/Makefile
+++ b/test/lib/scsi/scsi_bdev/Makefile
@@ -34,9 +34,9 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
diff --git a/test/lib/scsi/scsi_nvme/Makefile b/test/lib/scsi/scsi_nvme/Makefile
index 702a515cc3..aa9251a98f 100644
--- a/test/lib/scsi/scsi_nvme/Makefile
+++ b/test/lib/scsi/scsi_nvme/Makefile
@@ -33,8 +33,8 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
diff --git a/test/lib/util/io_channel/Makefile b/test/lib/util/io_channel/Makefile
index 90974e6a05..01448d6fa3 100644
--- a/test/lib/util/io_channel/Makefile
+++ b/test/lib/util/io_channel/Makefile
@@ -34,8 +34,8 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/build/lib/libspdk_cunit.a
 
 CFLAGS += $(DPDK_INC)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test