X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FMakefile.am;h=155ccd60e3f76cd86edec271016f64484b01033f;hb=113ef8305f6ba5f3c7df66294a7eb15dcb02e026;hp=540b48bcf7d373a9b433996c05e033ee199816fc;hpb=e0520732f1170797ecede546e346fea23c124d03;p=srvx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 540b48b..155ccd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,35 +10,41 @@ noinst_DATA = \
 	nickserv.help \
 	opserv.help \
 	saxdb.help \
-	sendmail.help \
+	mail.help \
 	mod-helpserv.help \
 	mod-memoserv.help \
 	mod-sockcheck.help
 EXTRA_DIST = $(noinst_DATA)
-BUILT_SOURCES = arch-version.h
-noinst_HEADERS = arch-version.h
 
-if HAS_GNU_ARCH
+if HAS_GIT
+BUILT_SOURCES = git-version.c
 .PHONY: checkversion
-arch-version.h: checkversion
+git-version.c: checkversion
 checkversion:
-	@$(GNU_ARCH) logs -f >/dev/null 2>&1 || exit 0; \
-	TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \
-	echo "#define ARCH_VERSION \"`$(GNU_ARCH) logs -f | tail -n 1`\"" >> $$TMPFILE ; \
-	if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \
+	@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 arch version into arch-version.h" ; \
-	    rm -f arch-version.h ; \
-	    mv $$TMPFILE arch-version.h ; \
+	    echo "Putting new git version into git-version.c" ; \
+	    rm -f git-version.c ; \
+	    mv $$TMPFILE git-version.c ; \
 	fi
 endif
 
 EXTRA_srvx_SOURCES = \
 	alloc-slab.c \
 	alloc-srvx.c \
+	config.h.win32 \
 	ioset-epoll.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 \
@@ -50,7 +56,7 @@ EXTRA_srvx_SOURCES = \
 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 \
@@ -64,6 +70,7 @@ srvx_SOURCES = \
 	helpfile.c helpfile.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 \
@@ -73,8 +80,8 @@ srvx_SOURCES = \
 	policer.c policer.h \
 	proto.h \
 	recdb.c recdb.h \
+	sar.c sar.h \
 	saxdb.c saxdb.h \
-	sendmail.c sendmail.h \
 	timeq.c timeq.h \
 	tools.c