Stefan Tauner has uploaded this change for review. ( https://review.coreboot.org/21830
Change subject: fixup! Convert flashrom to git ......................................................................
fixup! Convert flashrom to git
- exploit Make's -include statement to simplify execution flow - expend and refine respective comment to better describe and match the new behavior - two other minor whitespace changes
Change-Id: I0c66f2508cc754cf9219211a06d6f305a32c422d --- M Makefile 1 file changed, 5 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/21830/1
diff --git a/Makefile b/Makefile index b2db918..4484fc8 100644 --- a/Makefile +++ b/Makefile @@ -526,22 +526,17 @@
CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
-# Makefile.VCS is used when packaging flashrom and is generated by the -# export rule. If Makefile.VCS is not found, version info will be obtained -# using util/getrevision.sh. -ifeq ($(wildcard Makefile.VCS),) +# Makefile.VCS stores metadata required by the build process when packaging flashrom. It is generated by the +# export rule and imported below. If Makefile.VCS 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 Makefile.VCS VERSION ?= $(shell ./util/getrevision.sh --revision) MAN_DATE ?= $(shell ./util/getrevision.sh --date $(PROGRAM).8.tmpl 2>/dev/null) -else -include Makefile.VCS -endif
-# VERSION equals "offline" if online access is required but the respective git -# config variable is not set yet. +# VERSION equals "offline" if online access is required but the respective git config variable is not set yet. ifeq ($(VERSION),offline) $(error Aborting) endif - SCMDEF := -D'FLASHROM_VERSION="$(VERSION)"'
# No spaces in release names unless set explicitly