From 1d345227030a86948e53449013d4f724c4399855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= <rene.kijewski@fu-berlin.de>
Date: Sat, 21 Jun 2014 18:29:16 +0200
Subject: [PATCH] make: evaluate the Git SHA only once
---
Makefile.base | 12 ------------
Makefile.include | 13 +++++++++++++
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Makefile.base b/Makefile.base
index fef2c88e91..db9c68b9da 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -21,18 +21,6 @@ endif
OBJ = $(SRC:%.c=$(BINDIR)$(MODULE)/%.o)
DEP = $(SRC:%.c=$(BINDIR)$(MODULE)/%.d)
-GIT_STRING := $(shell git describe --always --abbrev=4 --dirty=-`hostname`)
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
-ifeq ($(strip $(GIT_BRANCH)),master)
- GIT_VERSION = $(GIT_STRING)
-else
- GIT_VERSION = $(shell echo $(GIT_STRING) $(GIT_BRANCH) | sed 's/ /-/')
-endif
-ifeq ($(strip $(GIT_VERSION)),)
- GIT_VERSION := "UNKNOWN"
-endif
-export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"
-
$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
$(AD)$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
diff --git a/Makefile.include b/Makefile.include
index 50c6c53cb6..cbb19638d7 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -60,6 +60,19 @@ endif
# Feature test default CFLAGS and LINKFLAGS for the set compiled.
include $(RIOTBASE)/Makefile.cflags
+# make the RIOT version available to the program
+GIT_STRING := $(shell git describe --always --abbrev=4 --dirty=-`hostname`)
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+ifeq ($(strip $(GIT_BRANCH)),master)
+ GIT_VERSION = $(GIT_STRING)
+else
+ GIT_VERSION = $(shell echo $(GIT_STRING) $(GIT_BRANCH) | sed 's/ /-/')
+endif
+ifeq ($(strip $(GIT_VERSION)),)
+ GIT_VERSION := "UNKNOWN"
+endif
+export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"
+
# the binaries to link
BASELIBS += $(BINDIR)$(BOARD)_base.a
BASELIBS += $(BINDIR)${APPLICATION}.a
--
GitLab