add better git version output

[srvx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 465c1303d76b8cb7d00d3b9d22ba3c3dd1783b5d..4c20c6fb4844d8be78c27f028046f6c74af9fd0a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,8 @@ noinst_DATA = \
        mod-memoserv.help \
        mod-qserver.help \
        mod-snoop.help \
-       mod-sockcheck.help
+       mod-sockcheck.help \
+       mod-hostserv.help
 EXTRA_DIST = $(noinst_DATA)
 
 BUILT_SOURCES = git-version.c
@@ -26,10 +27,13 @@ git-version.c: checkversion
 
 if HAS_GIT
 checkversion:
-       @GIT_VERSION=`$(GIT) describe`; \
+       @GIT_VERSION=`$(GIT) log -n 1 --pretty="format:%h"`; \
        [ "z$$GIT_VERSION" != "z" ] || exit 0; \
        TMPFILE=`mktemp git-version.c.XXXXXX` || exit 1 ; \
-       echo "const char git_version[] = \"$${GIT_VERSION}\";" >> $$TMPFILE ; \
+       GIT_LASTCOMMIT=$$GIT_VERSION; \
+    GIT_COMMITCOUNT=`$(GIT) rev-list --all | wc -l | sed "s/[ \t]//g"`; \
+    GIT_REVISION="git-$${GIT_COMMITCOUNT}-$${GIT_LASTCOMMIT}"; \
+    echo "const char git_version[] = \"$${GIT_REVISION}\";" >> $$TMPFILE ; \
        if diff -q git-version.c $$TMPFILE >/dev/null 2>&1 ; then \
            rm $$TMPFILE ; \
         else \
@@ -39,7 +43,7 @@ checkversion:
        fi
 else
 checkversion:
-       echo "const char git_version[] = \"\";" >> git-version.c ;
+       echo "const char git_version[] = \"git-0-0\";" >> git-version.c ;
 endif
 
 EXTRA_srvx_SOURCES = \
@@ -63,7 +67,8 @@ EXTRA_srvx_SOURCES = \
        mod-memoserv.c \
        mod-qserver.c \
        mod-snoop.c \
-       mod-sockcheck.c
+       mod-sockcheck.c \
+       mod-hostserv.c
 srvx_LDADD = @MODULE_OBJS@
 srvx_DEPENDENCIES = @MODULE_OBJS@
 srvx_SOURCES = \