From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 20 Jul 2016 17:05:45 +0000 (+0100)
Subject: Export ROOT, DESTDIR and PREFIX to all makefiles
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ac013df06291acae1558cc741f758fa412bc6e21;p=xtf.git

Export ROOT, DESTDIR and PREFIX to all makefiles

Rather than regenerating them from defaults each time.  Drop the MAKEFLAGS
lines, as MAKEFLAGS are automatically inherited by sub-makes.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/Makefile b/Makefile
index 0478221..e21605d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 MAKEFLAGS += -r
 ROOT := $(abspath $(CURDIR))
+export ROOT
+
 DESTDIR ?= $(ROOT)/dist
 PREFIX ?= $(ROOT)
+export DESTDIR PREFIX
 
 # Programs used
 CC              ?= $(CROSS_COMPILE)gcc
diff --git a/build/common.mk b/build/common.mk
index 9f97003..52721d8 100644
--- a/build/common.mk
+++ b/build/common.mk
@@ -1,6 +1,3 @@
-DESTDIR ?= $(ROOT)/dist
-PREFIX ?= $(ROOT)
-
 ALL_CATEGORIES     := special functional xsa utility
 
 ALL_ENVIRONMENTS   := pv64 pv32pae hvm64 hvm32pae hvm32pse hvm32
diff --git a/make-new-test.sh b/make-new-test.sh
index b2874df..eb0e26b 100755
--- a/make-new-test.sh
+++ b/make-new-test.sh
@@ -48,9 +48,6 @@ fi
 echo "Writing default tests/$NAME/Makefile"
 {
 cat <<EOF
-MAKEFLAGS += -r
-ROOT := \$(abspath \$(CURDIR)/../..)
-
 include \$(ROOT)/build/common.mk
 
 NAME      := $NAME
diff --git a/selftests/Makefile b/selftests/Makefile
index 5806562..e46346d 100644
--- a/selftests/Makefile
+++ b/selftests/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/..)
-
 COMMON_CFLAGS := -Wall -Werror -Wextra -MMD -MP
 
 TESTS := test-vsnprintf32
diff --git a/tests/cpuid/Makefile b/tests/cpuid/Makefile
index b6d2904..a6a66b3 100644
--- a/tests/cpuid/Makefile
+++ b/tests/cpuid/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := cpuid
diff --git a/tests/example/Makefile b/tests/example/Makefile
index 872769d..6c5a981 100644
--- a/tests/example/Makefile
+++ b/tests/example/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := example
diff --git a/tests/fep/Makefile b/tests/fep/Makefile
index e9410c2..15358f4 100644
--- a/tests/fep/Makefile
+++ b/tests/fep/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := fep
diff --git a/tests/invlpg/Makefile b/tests/invlpg/Makefile
index c1db653..7e0316e 100644
--- a/tests/invlpg/Makefile
+++ b/tests/invlpg/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := invlpg
diff --git a/tests/msr/Makefile b/tests/msr/Makefile
index dfe9266..0c0cecd 100644
--- a/tests/msr/Makefile
+++ b/tests/msr/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := msr
diff --git a/tests/pv-iopl/Makefile b/tests/pv-iopl/Makefile
index 5b20f4a..be3e980 100644
--- a/tests/pv-iopl/Makefile
+++ b/tests/pv-iopl/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := pv-iopl
diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile
index fc249d7..4555f89 100644
--- a/tests/selftest/Makefile
+++ b/tests/selftest/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := selftest
diff --git a/tests/swint-emulation/Makefile b/tests/swint-emulation/Makefile
index 246afb3..3c09988 100644
--- a/tests/swint-emulation/Makefile
+++ b/tests/swint-emulation/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := swint-emulation
diff --git a/tests/xsa-122/Makefile b/tests/xsa-122/Makefile
index fd07eed..040d060 100644
--- a/tests/xsa-122/Makefile
+++ b/tests/xsa-122/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := xsa-122
diff --git a/tests/xsa-123/Makefile b/tests/xsa-123/Makefile
index ea835cd..9f2a7c7 100644
--- a/tests/xsa-123/Makefile
+++ b/tests/xsa-123/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := xsa-123
diff --git a/tests/xsa-167/Makefile b/tests/xsa-167/Makefile
index 614fefc..96677b5 100644
--- a/tests/xsa-167/Makefile
+++ b/tests/xsa-167/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := xsa-167
diff --git a/tests/xsa-168/Makefile b/tests/xsa-168/Makefile
index 5ab6e3a..1ee2997 100644
--- a/tests/xsa-168/Makefile
+++ b/tests/xsa-168/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := xsa-168
diff --git a/tests/xsa-173/Makefile b/tests/xsa-173/Makefile
index d59e898..20822fd 100644
--- a/tests/xsa-173/Makefile
+++ b/tests/xsa-173/Makefile
@@ -1,6 +1,3 @@
-MAKEFLAGS += -r
-ROOT := $(abspath $(CURDIR)/../..)
-
 include $(ROOT)/build/common.mk
 
 NAME      := xsa-173