]> xenbits.xensource.com Git - xtf.git/commitdiff
build: Include Makefile.local earlier
authorAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 19 Aug 2021 11:41:34 +0000 (12:41 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 19 Aug 2021 11:44:37 +0000 (12:44 +0100)
... 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>
Makefile

index 919595737db2c7c13be8bee8320238c719b2fa2f..8d8277ee1014a3401b465e1255a09b0106780b59 100644 (file)
--- 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