From c5eb65aabf6e1db74bdd3b9a44b3d526a15da14c Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Wed, 3 Jun 2015 21:36:22 -0700 Subject: [PATCH] makefile tweak --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 154a781..b294b2f 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ LED_SERIAL_PIN ?= 2 VERSION := "esp-link custom version" DATE := $(shell date '+%F %T') BRANCH := $(shell git rev-parse --abbrev-ref HEAD) -SHA := $(shell if git diff --quiet HEAD; then git symbolic-ref HEAD | cut -d"/" -f 3; \ +SHA := $(shell if git diff --quiet HEAD; then git rev-parse --short HEAD | cut -d"/" -f 3; \ else echo "development"; fi) VERSION := esp-link - $(BRANCH) - $(DATE) - $(SHA) @@ -194,8 +194,6 @@ all: echo_version checkdirs $(FW_BASE) firmware/user1.bin firmware/user2.bin echo_version: @echo VERSION: $(VERSION) -user/version.h: - $(TARGET_OUT): $(APP_AR) $(LD_SCRIPT) $(vecho) "LD $@" $(Q) $(LD) -L$(SDK_LIBDIR) -T$(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@