NurPech@nextirc.net

[srvx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 34456de682cce521696a5793d826f36c2d5446ef..627c1dc172d4808d849e3b0384ac87bac264b765 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,34 +11,35 @@ 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
 EXTRA_DIST = $(noinst_DATA)
-BUILT_SOURCES = git-version.h
-noinst_HEADERS = git-version.h
 
-if HAS_GIT
+BUILT_SOURCES = git-version.c
 .PHONY: checkversion
-git-version.h: checkversion
+git-version.c: checkversion
+
+if HAS_GIT
 checkversion:
-       @( cd $(top_srcdir) && $(GIT) symbolic-ref HEAD ) >/dev/null 2>&1 || exit 0; \
-       TMPFILE=`mktemp git-version.h.XXXXXX` || exit 1 ; \
-       ( \
-         cd $(top_srcdir) ; \
-         GIT_DIR=$${GIT_DIR:-.git} ; \
-         HEAD_NAME=`$(GIT) symbolic-ref HEAD` ; \
-         HEAD_SHA1=`cat $${GIT_DIR}/$${HEAD_NAME}` ; \
-         echo "/* Full revision $${HEAD_SHA1} */" ; \
-         echo "#define GIT_VERSION \"$${HEAD_SHA1%????????????????????????????????}\"" ; \
-       ) >> $$TMPFILE ; \
-       if diff -q git-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 git version into git-version.h" ; \
-           rm -f git-version.h ; \
-           mv $$TMPFILE git-version.h ; \
+           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 = \
@@ -46,6 +47,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 \
@@ -55,15 +57,18 @@ 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 = \
-       git-version.h \
+       git-version.c \
        chanserv.c chanserv.h \
        compat.c compat.h \
        conf.c conf.h \
@@ -87,9 +92,12 @@ srvx_SOURCES = \
        policer.c policer.h \
        proto.h \
        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