Skip to content

Commit

Permalink
makefile tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
tve committed Jun 4, 2015
1 parent 7ff16bc commit c5eb65a
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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 $@
Expand Down

0 comments on commit c5eb65a

Please sign in to comment.