From 318b378c54aa976dc3daf04318b0e75bcf75411b Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Sat, 30 Sep 2017 09:07:29 +0200 Subject: [PATCH] Fix make target redefinition error for BUILD_ID --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c546fa8..24ef08f 100644 --- a/Makefile +++ b/Makefile @@ -39,13 +39,13 @@ else include $(SMING_HOME)/Makefile-project.mk endif -$(APP_AR): $(OBJ) - $(vecho) "AR $@" - +# Add BUILD_ID versioning +$(APP_AR): $(BUILD_BASE)/ver.o +OBJ += $(BUILD_BASE)/ver.o +$(BUILD_BASE)/ver.o: @echo "char* BUILD_ID = \"$(shell git rev-parse --short HEAD)-$(shell TZ=UTC date +%Y%m%d-%H%M%S)\";" > $(BUILD_BASE)/ver.c $(Q) $(CC) -c $(BUILD_BASE)/ver.c -o $(BUILD_BASE)/ver.o - $(Q) $(AR) cru $@ $^ $(BUILD_BASE)/ver.o ota: all -mkdir ../master/ota/$(DEVICE) >/dev/null