add better git version output

[srvx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 155ccd60e3f76cd86edec271016f64484b01033f..4c20c6fb4844d8be78c27f028046f6c74af9fd0a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = @RX_INCLUDES@
 LIBS = @LIBS@ @RX_LIBS@
 
-noinst_PROGRAMS = srvx
+noinst_PROGRAMS = srvx slab-read
 EXTRA_PROGRAMS = checkdb globtest
 noinst_DATA = \
        chanserv.help \
@@ -11,20 +11,29 @@ noinst_DATA = \
        opserv.help \
        saxdb.help \
        mail.help \
+    spamserv.help \
        mod-helpserv.help \
+    mod-watchdog.help \
        mod-memoserv.help \
-       mod-sockcheck.help
+       mod-qserver.help \
+       mod-snoop.help \
+       mod-sockcheck.help \
+       mod-hostserv.help
 EXTRA_DIST = $(noinst_DATA)
 
-if HAS_GIT
 BUILT_SOURCES = git-version.c
 .PHONY: checkversion
 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 \
@@ -32,6 +41,9 @@ checkversion:
            rm -f git-version.c ; \
            mv $$TMPFILE git-version.c ; \
        fi
+else
+checkversion:
+       echo "const char git_version[] = \"git-0-0\";" >> git-version.c ;
 endif
 
 EXTRA_srvx_SOURCES = \
@@ -39,6 +51,7 @@ EXTRA_srvx_SOURCES = \
        alloc-srvx.c \
        config.h.win32 \
        ioset-epoll.c \
+       ioset-kevent.c \
        ioset-select.c \
        ioset-win32.c \
        mail-common.c \
@@ -48,11 +61,14 @@ EXTRA_srvx_SOURCES = \
        proto-bahamut.c \
        proto-common.c \
        proto-p10.c \
-       mod-snoop.c \
-       mod-memoserv.c \
+       mod-blacklist.c \
        mod-helpserv.c \
+    mod-watchdog.c \
+       mod-memoserv.c \
        mod-qserver.c \
-       mod-sockcheck.c
+       mod-snoop.c \
+       mod-sockcheck.c \
+       mod-hostserv.c
 srvx_LDADD = @MODULE_OBJS@
 srvx_DEPENDENCIES = @MODULE_OBJS@
 srvx_SOURCES = \
@@ -82,8 +98,10 @@ srvx_SOURCES = \
        recdb.c recdb.h \
        sar.c sar.h \
        saxdb.c saxdb.h \
+    spamserv.c spamserv.h \
        timeq.c timeq.h \
        tools.c
 
 checkdb_SOURCES = checkdb.c common.h compat.c compat.h dict-splay.c dict.h recdb.c recdb.h saxdb.c saxdb.h tools.c conf.h log.h modcmd.h saxdb.h timeq.h
 globtest_SOURCES = common.h compat.c compat.h dict-splay.c dict.h globtest.c tools.c
+slab_read_SOURCES = slab-read.c