diff --git a/Makefile.base b/Makefile.base index fef2c88e9175cf224b91d156dd5fb85fedca8fe2..db9c68b9da5ff7e287259854dfcf42b71b9b5bf4 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 50c6c53cb65b71416d21cf82836cf89070dbaa6e..cbb19638d7dfaaa390dd2c9182d12275d0075eb4 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