From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 19 Aug 2021 11:41:34 +0000 (+0100)
Subject: build: Include Makefile.local earlier
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bc26bc260cbfec1c6de1778ef17cf0faa54c0e03;p=xtf.git

build: Include Makefile.local earlier

... to allow overriding variables as well as rules.  Explicitly default to
all: rule to retain the previous behaviour.

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

diff --git a/Makefile b/Makefile
index 9195957..8d8277e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,12 @@ MAKEFLAGS += -rR
 ROOT := $(abspath $(CURDIR))
 export ROOT
 
+# Default to the all rule
+all:
+
+# Local settings and rules
+-include Makefile.local
+
 # $(xtfdir) defaults to $(ROOT) so development and testing can be done
 # straight out of the working tree.
 xtfdir  ?= $(ROOT)
@@ -97,5 +103,3 @@ doxygen: Doxyfile
 .PHONY: pylint
 pylint:
 	-pylint --rcfile=.pylintrc xtf-runner
-
--include Makefile.local