X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FMakefile.am;h=4c20c6fb4844d8be78c27f028046f6c74af9fd0a;hb=880457f83c5c05dbb54f31d294257f085abd6c58;hp=adcb5518c5d0c8dee722fd3e35d82183e19b6cb6;hpb=99b1d1ee2e6b9c0e77df58a5a0f35215c07b676f;p=srvx.git diff --git a/src/Makefile.am b/src/Makefile.am index adcb551..4c20c6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,22 +11,29 @@ noinst_DATA = \ opserv.help \ saxdb.help \ mail.help \ + spamserv.help \ mod-helpserv.help \ + mod-watchdog.help \ mod-memoserv.help \ mod-qserver.help \ mod-snoop.help \ - mod-sockcheck.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 \ @@ -34,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 = \ @@ -53,10 +63,12 @@ EXTRA_srvx_SOURCES = \ proto-p10.c \ mod-blacklist.c \ mod-helpserv.c \ + mod-watchdog.c \ 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 = \ @@ -86,6 +98,7 @@ srvx_SOURCES = \ recdb.c recdb.h \ sar.c sar.h \ saxdb.c saxdb.h \ + spamserv.c spamserv.h \ timeq.c timeq.h \ tools.c