From fa25bc3cd433e2cdbf8d0922a29be71815a072cd Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Wed, 4 Oct 2017 03:47:26 +0200 Subject: fixup! Convert flashrom to git - exploit Make's -include statement to simplify execution flow - expand and refine respective comment to better describe and match the new behavior Change-Id: I0c66f2508cc754cf9219211a06d6f305a32c422d Signed-off-by: Stefan Tauner Reviewed-on: https://review.coreboot.org/21830 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d0145809..1893bb19 100644 --- a/Makefile +++ b/Makefile @@ -526,15 +526,12 @@ LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o -# versioninfo.inc is used when packaging flashrom and is generated by the -# export rule. If versioninfo.inc is not found, version info will be obtained -# using util/getrevision.sh. -ifeq ($(wildcard versioninfo.inc),) +# versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and +# imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will +# be obtained using util/getrevision.sh, which is the common case during development. +-include versioninfo.inc VERSION ?= $(shell ./util/getrevision.sh --revision) MAN_DATE ?= $(shell ./util/getrevision.sh --date $(PROGRAM).8.tmpl 2>/dev/null) -else -include versioninfo.inc -endif # VERSION equals "offline" if online access is required but the respective git # config variable is not set yet. -- cgit v1.2.3