ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: include spdk.common.mk in lib Makefiles

Browse Source 
Explicitly include spdk.common.mk at the top of all lib Makefiles so
that CONFIG options and other predefined variables are set.

Change-Id: I1e560c294fe8242602e45191a280f4295533ae44
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-18 16:12:51 -07:00
parent cf29df4418
commit 0cb9522781
15 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/conf/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = conf.c C_SRCS = conf.c
LIBNAME = conf LIBNAME = conf

1
lib/cunit/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/test
C_SRCS = spdk_cunit.c C_SRCS = spdk_cunit.c

1
lib/event/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
LIBNAME = event LIBNAME = event

1
lib/event/rpc/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = app_rpc.c C_SRCS = app_rpc.c
LIBNAME = app_rpc LIBNAME = app_rpc

1
lib/ioat/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) -include $(CONFIG_IOAT_IMPL) CFLAGS += $(DPDK_INC) -include $(CONFIG_IOAT_IMPL)
C_SRCS = ioat.c C_SRCS = ioat.c

1
lib/json/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = json_parse.c json_util.c json_write.c C_SRCS = json_parse.c json_util.c json_write.c
LIBNAME = json LIBNAME = json

1
lib/jsonrpc/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
LIBNAME = jsonrpc LIBNAME = jsonrpc
C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c

1
lib/log/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = log.c C_SRCS = log.c
LIBNAME = log LIBNAME = log

1
lib/log/rpc/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = log_rpc.c C_SRCS = log_rpc.c
LIBNAME = log_rpc LIBNAME = log_rpc

1
lib/memory/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
C_SRCS = vtophys.c C_SRCS = vtophys.c

1
lib/nvme/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL) CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL)
C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c nvme_intel.c C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c nvme_intel.c

2
lib/nvmf/Makefile
View File

@ -32,7 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/CONFIG include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
LIBNAME = nvmf LIBNAME = nvmf

1
lib/rpc/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
C_SRCS = rpc.c C_SRCS = rpc.c

1
lib/trace/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
C_SRCS = trace.c C_SRCS = trace.c

1
lib/util/Makefile
View File

@ -32,6 +32,7 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
C_SRCS = file.c string.c pci.c C_SRCS = file.c string.c pci.c