wirtz
/
esp-link
mirror of https://github.com/jeelabs/esp-link.git
1
0
Fork 0
Code Issues Releases Wiki Activity

makefile tweak

Browse Source
pull/7/head 0.9.4
Thorsten von Eicken 10 years ago
parent 7ff16bc321
commit c5eb65aabf
1 changed files with 1 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile

4
Makefile
Unescape View File

@ -55,7 +55,7 @@ LED_SERIAL_PIN ?= 2
VERSION := "esp-link custom version" VERSION := "esp-link custom version"
DATE := $(shell date '+%F %T') DATE := $(shell date '+%F %T')
BRANCH := $(shell git rev-parse --abbrev-ref HEAD) 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) else echo "development"; fi)
VERSION := esp-link - $(BRANCH) - $(DATE) - $(SHA) 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:
@echo VERSION: $(VERSION) @echo VERSION: $(VERSION)
user/version.h:
$(TARGET_OUT): $(APP_AR) $(LD_SCRIPT) $(TARGET_OUT): $(APP_AR) $(LD_SCRIPT)
$(vecho) "LD $@" $(vecho) "LD $@"
$(Q) $(LD) -L$(SDK_LIBDIR) -T$(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@ $(Q) $(LD) -L$(SDK_LIBDIR) -T$(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@

Write Preview
Loading…
Cancel
Save