X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FMakefile.am;h=4c20c6fb4844d8be78c27f028046f6c74af9fd0a;hb=880457f83c5c05dbb54f31d294257f085abd6c58;hp=15f02be8bd8b01098663b47d337fec31b7c93322;hpb=44345ace94318afe569c6940d662b339577c8ba8;p=srvx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 15f02be..4c20c6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,78 @@
 AM_CPPFLAGS = @RX_INCLUDES@
 LIBS = @LIBS@ @RX_LIBS@
 
-ARCH_REVISION=$(shell tla logs -f | tail -n 1)
-noinst_PROGRAMS = srvx
+noinst_PROGRAMS = srvx slab-read
 EXTRA_PROGRAMS = checkdb globtest
-noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help
+noinst_DATA = \
+	chanserv.help \
+	global.help \
+	modcmd.help \
+	nickserv.help \
+	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-hostserv.help
 EXTRA_DIST = $(noinst_DATA)
-BUILT_SOURCES = arch-version.h
-noinst_HEADERS = arch-version.h
 
-EXTRA_srvx_SOURCES = proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+BUILT_SOURCES = git-version.c
+.PHONY: checkversion
+git-version.c: checkversion
+
+if HAS_GIT
+checkversion:
+	@GIT_VERSION=`$(GIT) log -n 1 --pretty="format:%h"`; \
+	[ "z$$GIT_VERSION" != "z" ] || exit 0; \
+	TMPFILE=`mktemp git-version.c.XXXXXX` || exit 1 ; \
+	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 \
+	    echo "Putting new git version into git-version.c" ; \
+	    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 = \
+	alloc-slab.c \
+	alloc-srvx.c \
+	config.h.win32 \
+	ioset-epoll.c \
+	ioset-kevent.c \
+	ioset-select.c \
+	ioset-win32.c \
+	mail-common.c \
+	mail-sendmail.c \
+	main-common.c \
+	main-win32.c \
+	proto-bahamut.c \
+	proto-common.c \
+	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-hostserv.c
 srvx_LDADD = @MODULE_OBJS@
 srvx_DEPENDENCIES = @MODULE_OBJS@
 srvx_SOURCES = \
-	arch-version.h \
+	git-version.c \
 	chanserv.c chanserv.h \
 	compat.c compat.h \
 	conf.c conf.h \
@@ -25,8 +84,9 @@ srvx_SOURCES = \
 	hash.c hash.h \
 	heap.c heap.h \
 	helpfile.c helpfile.h \
-	ioset.c ioset.h \
+	ioset.c ioset.h ioset-impl.h \
 	log.c log.h \
+	mail.h \
 	main.c common.h \
 	md5.c md5.h \
 	modcmd.c modcmd.h \
@@ -36,10 +96,12 @@ srvx_SOURCES = \
 	policer.c policer.h \
 	proto.h \
 	recdb.c recdb.h \
+	sar.c sar.h \
 	saxdb.c saxdb.h \
-	sendmail.c sendmail.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