diff --git a/Make-Release.in b/Make-Release.in
new file mode 100644
index 0000000000000000000000000000000000000000..972b746d34a07bfa960cc2189c0499ef8fccfabe
--- /dev/null
+++ b/Make-Release.in
@@ -0,0 +1,16 @@
+
+RELEASE := GIT:: $(shell git describe --dirty)
+CXXFLAGS += -D'RELEASE="$(RELEASE)"'
+REPO := GIT:: $(shell git config --get remote.origin.url)
+LOC_REPO := GIT:: $(shell git rev-parse --show-toplevel)
+CXXFLAGS += -D'REPO="$(LOC_REPO)"'
+SUBMODULES +=
+
+REL_SRCS_0 += $(shell find . -name "*.cpp" -exec grep -l -e RELEASE -e REPO -e SUBMODULES {} \;)
+REL_SRCS   += $(subst ./,, $(REL_SRCS_0))
+REL_OBJS   += $(addprefix obj/,$(notdir $(REL_SRCS:.cpp=.o)))
+
+.PHONY: tags_clean
+	
+tags_clean:
+	@rm -f $(REL_OBJS)
diff --git a/Makefile b/Makefile
index 6c6764e83b3cf19d1e047496526fadc92a3d27a4..276dfca0e24c105384336e9fac15f6eafc502f05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 NAME_SRV = pespccdstage-srv
 
+all: tags_clean bin/$(NAME_SRV)
+
 CXXFLAGS =
 LDFLAGS = -litpp
 
@@ -71,17 +73,13 @@ else
   CXXFLAGS += -I /runtime/include/libaxisutils
 endif
 
-RELEASE := GIT:: $(shell git describe --dirty)
-CXXFLAGS += -D'RELEASE="$(RELEASE)"'
-REPO := GIT:: $(shell git config --get remote.origin.url)
-LOC_REPO := GIT:: $(shell git rev-parse --show-toplevel)
-CXXFLAGS += -D'REPO="$(LOC_REPO)"'
-
 include Make-libhist.in
 OBJ_FILES += $(EXTRA_OBJS)
 
 include ../makefiles/Make-9.3.3.in
 
+include Make-Release.in
+
 LDFLAGS  += -laxisutils
 
 ifeq ($(HAVE_SAFETYMANGER), yes)