2 files changed, 15 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 149f397..debe4b5 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,19 @@ CXXFLAGS := -Wall -Werror -std=c++20 -fPIC -iquote . ${OPTIMIZE} ${DEBUG}
 
 .DEFAULT: issim
 
+VERSION := $(shell git describe --always --dirty --long --tags 2> /dev/null)
+ifndef VERSION
+VERSION := unknown
+endif
+$(info Version ${VERSION})
+
+define GITTAGCPP =
+#include <string>
+
+std::string GIT_TAG = "$(subst ",\",${VERSION})";
+endef
+export GITTAGCPP
+
 libname = $(shell realpath --canonicalize-missing --relative-to . build/$(dir $(1))/lib$(notdir $(1)))
 
 define mklib =
@@ -35,7 +48,7 @@ endif
 
 endef
 
-PARTS := $(patsubst ./%,%,$(shell find -mindepth 1 -type d -\( -name .\* -prune -o -name build -prune -o -name tools -prune -o -print -\)))
+PARTS := $(patsubst ./%,%,$(shell find -mindepth 1 -type d -\( -name .\* -prune -o -name build -prune -o -print -\)))
 PARTARS :=
 PARTSOS :=
 
@@ -68,7 +81,7 @@ clean:
 
 build/git-tag.cpp:
         @mkdir -p $(dir $@)
-        tools/get-git-tag > $@
+        @echo "$$GITTAGCPP" > $@
 .PHONY: build/git-tag.cpp
 
 include $(shell find -type f -name \*.d)
diff --git a/tools/get-git-tag b/tools/get-git-tag
deleted file mode 100755
index cb4e2fa..0000000
--- a/tools/get-git-tag
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -u
-
-TAG="$(git describe --always --tags --long --dirty 2> /dev/null)"
-
-if [[ "$TAG" == "" ]]; then
-    TAG="unknown"
-fi
-
-cat <<END
-#include <string>
-
-std::string GIT_TAG = "$TAG";
-END