X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FMakefile.am;h=627c1dc172d4808d849e3b0384ac87bac264b765;hb=16812d9955571b1caa9459fad3d8404d3d283313;hp=205d4c69daa2ee086317af2d1a3205ff53c8af5a;hpb=222e1b0003536cf7b47858961d4b56d45c6d6606;p=srvx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 205d4c6..627c1dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,74 @@
 AM_CPPFLAGS = @RX_INCLUDES@
 LIBS = @LIBS@ @RX_LIBS@
 
-ARCH_REVISION=$(shell tla logs -f | tail -n 1)
-noinst_PROGRAMS = srvx expnhelp
+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
-EXTRA_DIST = nickserv.help.m4 $(noinst_DATA)
-BUILT_SOURCES = arch-version.h
-noinst_HEADERS = arch-version.h
-nickserv.help: nickserv.help.m4 expnhelp
-	./expnhelp < $(srcdir)/nickserv.help.m4 > $@
-arch-version.h:
-	@if [ -e $@ ] ; then OLD_REVISION=`cat $@` ; else OLD_REVISION="" ; fi ; \
-	ARCH_REVISION=`tla logs -f | tail -n 1` ; \
-	VERSION_CONTENTS="#define ARCH_VERSION \"$$ARCH_REVISION\"" ; \
-	if [ "z" != "z$$ARCH_REVISION" -a "z$$OLD_REVISION" != "z$$VERSION_CONTENTS" ] ; then \
-	    echo "Putting new arch version into $@" ; \
-	    echo $$VERSION_CONTENTS > $@ ; \
+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
+EXTRA_DIST = $(noinst_DATA)
+
+BUILT_SOURCES = git-version.c
+.PHONY: checkversion
+git-version.c: checkversion
+
+if HAS_GIT
+checkversion:
+	@GIT_VERSION=`$(GIT) describe`; \
+	[ "z$$GIT_VERSION" != "z" ] || exit 0; \
+	TMPFILE=`mktemp git-version.c.XXXXXX` || exit 1 ; \
+	echo "const char git_version[] = \"$${GIT_VERSION}\";" >> $$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-version.c ;
+endif
 
-EXTRA_srvx_SOURCES = proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+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 \
@@ -35,8 +80,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 \
@@ -46,11 +92,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
 
-expnhelp_SOURCES = common.h compat.c compat.h dict-splay.c dict.h expnhelp.c log.h recdb.c recdb.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