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 <daniel.verkamp@intel.com>
2015-11-04 10:19:08 -07:00 · 2015-11-04 10:19:08 -07:00 · 3677f46af8
commit 3677f46af8
parent 35e56a9603
20 changed files with 24 additions and 2 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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