Fixed a warning in src/main.c and removed unused old broken host hiding code

[irc/evilnet/x3.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f605f8632aff520f6c4029d23274c64420c64885..95aa04df916a4a515b4fc9abd10006ee04a212ec 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,32 +1,57 @@
 AM_CPPFLAGS = @RX_INCLUDES@
 LIBS = @LIBS@ @RX_LIBS@
+TRACK = @TRACK@
+pythonpath = @pythonpath@
+PY_CFLAGS = @PY_CFLAGS@
+PY_LIBS = @PY_LIBS@
 
-noinst_PROGRAMS = srvx
+
+noinst_PROGRAMS = x3 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-sockcheck.help \
+       mod-helpserv.help \
+       mod-memoserv.help \
+        mod-qserver.help \
+        mod-snoop.help \
+       mod-webtv.help \
+       mod-python.help
+
 EXTRA_DIST = $(noinst_DATA)
-BUILT_SOURCES = arch-version.h
-noinst_HEADERS = arch-version.h
-
-.PHONY: checkversion
-arch-version.h: checkversion
-checkversion:
-       @tla logs -f >/dev/null || exit 0; \
-       TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \
-       echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \
-       if diff -q arch-version.h $$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 ; \
-       fi
-
-EXTRA_srvx_SOURCES = proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
-srvx_LDADD = @MODULE_OBJS@
-srvx_DEPENDENCIES = @MODULE_OBJS@
-srvx_SOURCES = \
-       arch-version.h \
+
+EXTRA_x3_SOURCES = \
+       alloc-slab.c \
+       alloc-x3.c \
+       ioset-epoll.c \
+       ioset-kevent.c \
+       ioset-select.c \
+       mail-common.c \
+       mail-sendmail.c \
+       main-common.c \
+       proto-common.c \
+       proto-p10.c \
+       mod-blacklist.c \
+       mod-snoop.c \
+       mod-track.c \
+       mod-memoserv.c \
+       mod-helpserv.c \
+       mod-sockcheck.c \
+       mod-webtv.c \
+       mod-python.c \
+       mod-qserver.c
+
+x3_LDADD = @MODULE_OBJS@
+x3_DEPENDENCIES = @MODULE_OBJS@
+x3_SOURCES = \
+       base64.c base64.h \
        chanserv.c chanserv.h \
        compat.c compat.h \
        conf.c conf.h \
@@ -38,9 +63,11 @@ 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 \
+       math.c \
        md5.c md5.h \
        modcmd.c modcmd.h \
        modules.c modules.h \
@@ -49,10 +76,19 @@ 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 \
+       shun.c shun.h \
        timeq.c timeq.h \
-       tools.c
+       tools.c x3ldap.c x3ldap.h \
+       version.c version.h
 
 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
+
+version.c: version.c.SH
+       ${SHELL} ${srcdir}/version.c.SH
+
+.PHONY: version.c