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 04782217ce845b99a315923b2632c76d04696b35..e21605de342fb2951e3934d9b0e203ebd6693cf7 100644 (file)
--- 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 9f97003cd76685310194abdfd485a65e334c1ad5..52721d8545c71cc1f65a2de570edead338e2b427 100644 (file)
--- 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 b2874df7e05008cb2d1d9893eb4bc53ee1ef2116..eb0e26bcaf714a3da9db40098fa7f6fe1a409126 100755 (executable)
--- 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 58065622793b055f41896a13d6d5284d8ec057ff..e46346d7b34bff4a1bcdd11ff9252a78235367cd 100644 (file)
--- 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 b6d29040e0a35699e57e4de5d3d1feedfed8e068..a6a66b3dcc829d41732c257b60e195ca44e6812e 100644 (file)
--- 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 872769deb171a2cbeb46d553597cf8d3809e28e7..6c5a9812e39ab225167d9d51c4697c9e7c5cc776 100644 (file)
--- 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 e9410c28b7660774e105f70f7b7e14ef26728ff2..15358f4d337c43bc897c07f2856543d450805119 100644 (file)
--- 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 c1db653f7ae68896825155d7edb304fd64ab419c..7e0316ef33260fb5257e90cd357e9f5beba3a173 100644 (file)
--- 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 dfe92667c4b3306394268cc6493e8547b801fb8f..0c0cecda34fc7570f7c8b4f5e7005b93ae0a0f51 100644 (file)
--- 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 5b20f4a94c814fe7acd9084c9fc65e74b8dc37f4..be3e980a2b456b092c166484a5f074880e16024e 100644 (file)
--- 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 fc249d7656d0ab72dc304ad98e294f13944b55ed..4555f89088b80e92049ad8f54169a964c26f1cc0 100644 (file)
--- 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 246afb3ad3984f43f562a59b131beae2a9b1664c..3c09988336a7c172790ecf0dee0a186107672e68 100644 (file)
--- 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 fd07eedc86c91a7018dec44afdd6651cea4c1491..040d060c5abf85e188919cf6cec0ee88d2e66098 100644 (file)
--- 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 ea835cd41f75df77c43fd65bb4f7b8ccef4fc2af..9f2a7c74f4ee07baef9b84a837aa24db1bb890ab 100644 (file)
--- 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 614fefc257d79005019d920dfbd1d08b5ff423de..96677b52f921e752827c1e18e6b4e1c71cf7dde0 100644 (file)
--- 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 5ab6e3a6ddf2f5167ad59909888de3034938d34a..1ee2997db230126e2469ed9839df32f6e8bc4f2e 100644 (file)
--- 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 d59e898cdd5ee93d45070a9b074e8271d5eb3a6f..20822fddbf798bc362662f0920aa924912999947 100644 (file)
--- 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