From 3677f46af8939c2e9154c9492d91b27f999040ce Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 4 Nov 2015 10:19:08 -0700 Subject: [PATCH] build: allow make to work from any directory Set SPDK_ROOT_DIR explicitly in each Makefile so that make from a subdirectory will work (assuming all dependencies from the upper directory have already been built). This allows partial rebuilds of the source tree, as well as building the unit tests without requiring DPDK. Change-Id: I3f65b805d490b40ff5ec53cceb61df542ce814f1 Signed-off-by: Daniel Verkamp --- Makefile | 2 -- examples/Makefile | 1 + examples/nvme/Makefile | 1 + examples/nvme/identify/Makefile | 1 + examples/nvme/perf/Makefile | 1 + lib/Makefile | 1 + lib/memory/Makefile | 1 + lib/nvme/Makefile | 1 + lib/util/Makefile | 1 + test/Makefile | 1 + test/lib/Makefile | 1 + test/lib/memory/Makefile | 1 + test/lib/nvme/Makefile | 1 + test/lib/nvme/aer/Makefile | 1 + test/lib/nvme/unit/Makefile | 1 + test/lib/nvme/unit/nvme_c/Makefile | 2 ++ test/lib/nvme/unit/nvme_ctrlr_c/Makefile | 2 ++ test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile | 2 ++ test/lib/nvme/unit/nvme_ns_cmd_c/Makefile | 2 ++ test/lib/nvme/unit/nvme_qpair_c/Makefile | 2 ++ 20 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a606733a1..09f31102c 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,6 @@ # SPDK_ROOT_DIR := $(CURDIR) -export SPDK_ROOT_DIR - include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += lib test examples diff --git a/examples/Makefile b/examples/Makefile index a5fb367aa..707d3aec1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += nvme diff --git a/examples/nvme/Makefile b/examples/nvme/Makefile index 2d7a96dc6..9cf98aef7 100644 --- a/examples/nvme/Makefile +++ b/examples/nvme/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += identify perf diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile index 3365d15df..46cc3589b 100644 --- a/examples/nvme/identify/Makefile +++ b/examples/nvme/identify/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = identify diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile index d04feb967..1095b408a 100644 --- a/examples/nvme/perf/Makefile +++ b/examples/nvme/perf/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = perf diff --git a/lib/Makefile b/lib/Makefile index 495b12c6f..cc3b61545 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += memory util nvme diff --git a/lib/memory/Makefile b/lib/memory/Makefile index 08af0cb71..088d63615 100644 --- a/lib/memory/Makefile +++ b/lib/memory/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index f98883b34..a94cc3437 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL) diff --git a/lib/util/Makefile b/lib/util/Makefile index 86d76e4ba..7985d7e37 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) diff --git a/test/Makefile b/test/Makefile index 34aff4861..96af84613 100644 --- a/test/Makefile +++ b/test/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk # These directories contain tests. diff --git a/test/lib/Makefile b/test/lib/Makefile index 64d26b615..50652a3f1 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = nvme memory diff --git a/test/lib/memory/Makefile b/test/lib/memory/Makefile index cd608de73..e1ce3bbf3 100644 --- a/test/lib/memory/Makefile +++ b/test/lib/memory/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = vtophys.c diff --git a/test/lib/nvme/Makefile b/test/lib/nvme/Makefile index 675b83aac..44a663177 100644 --- a/test/lib/nvme/Makefile +++ b/test/lib/nvme/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = unit aer diff --git a/test/lib/nvme/aer/Makefile b/test/lib/nvme/aer/Makefile index 8e1b0a42b..9afc263f1 100644 --- a/test/lib/nvme/aer/Makefile +++ b/test/lib/nvme/aer/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = aer diff --git a/test/lib/nvme/unit/Makefile b/test/lib/nvme/unit/Makefile index 0fe65a3a1..94301f60b 100644 --- a/test/lib/nvme/unit/Makefile +++ b/test/lib/nvme/unit/Makefile @@ -31,6 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = nvme_c nvme_ns_cmd_c nvme_qpair_c nvme_ctrlr_c nvme_ctrlr_cmd_c diff --git a/test/lib/nvme/unit/nvme_c/Makefile b/test/lib/nvme/unit/nvme_c/Makefile index 184080f0b..10016d12b 100644 --- a/test/lib/nvme/unit/nvme_c/Makefile +++ b/test/lib/nvme/unit/nvme_c/Makefile @@ -31,6 +31,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../../.. + TEST_FILE = nvme_ut.c include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile b/test/lib/nvme/unit/nvme_ctrlr_c/Makefile index 4387e5eb1..284decbb4 100644 --- a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile +++ b/test/lib/nvme/unit/nvme_ctrlr_c/Makefile @@ -31,6 +31,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../../.. + TEST_FILE = nvme_ctrlr_ut.c include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk diff --git a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile b/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile index 195e00df5..b3872cd36 100644 --- a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile +++ b/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile @@ -31,6 +31,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../../.. + TEST_FILE = nvme_ctrlr_cmd_ut.c include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile b/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile index 3a3b8960a..d9d9b25a7 100644 --- a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile +++ b/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile @@ -31,6 +31,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../../.. + TEST_FILE = nvme_ns_cmd_ut.c OTHER_FILES = nvme.c diff --git a/test/lib/nvme/unit/nvme_qpair_c/Makefile b/test/lib/nvme/unit/nvme_qpair_c/Makefile index 009d572b7..3ef7e6bd0 100644 --- a/test/lib/nvme/unit/nvme_qpair_c/Makefile +++ b/test/lib/nvme/unit/nvme_qpair_c/Makefile @@ -31,6 +31,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +SPDK_ROOT_DIR := $(CURDIR)/../../../../.. + TEST_FILE = nvme_qpair_ut.c include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk