Couple of srvx updates.

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

diff --git a/src/Makefile.in b/src/Makefile.in
index 39a2d03b07193da778fc3963edb3eb3794c69f3e..02a79513fdada07c9daf8dd7edfae3490b2b5ebb 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -19,7 +19,6 @@ VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-pythonpath = @pythonpath@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,7 +34,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-noinst_PROGRAMS = x3$(EXEEXT)
+noinst_PROGRAMS = x3$(EXEEXT) slab-read$(EXEEXT)
 EXTRA_PROGRAMS = checkdb$(EXEEXT) globtest$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -57,6 +56,9 @@ am_globtest_OBJECTS = compat.$(OBJEXT) dict-splay.$(OBJEXT) \
        globtest.$(OBJEXT) tools.$(OBJEXT)
 globtest_OBJECTS = $(am_globtest_OBJECTS)
 globtest_LDADD = $(LDADD)
+am_slab_read_OBJECTS = slab-read.$(OBJEXT)
+slab_read_OBJECTS = $(am_slab_read_OBJECTS)
+slab_read_LDADD = $(LDADD)
 am_x3_OBJECTS = chanserv.$(OBJEXT) compat.$(OBJEXT) conf.$(OBJEXT) \
        dict-splay.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \
        gline.$(OBJEXT) global.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
@@ -64,21 +66,21 @@ am_x3_OBJECTS = chanserv.$(OBJEXT) compat.$(OBJEXT) conf.$(OBJEXT) \
        log.$(OBJEXT) main.$(OBJEXT) math.$(OBJEXT) md5.$(OBJEXT) \
        modcmd.$(OBJEXT) modules.$(OBJEXT) nickserv.$(OBJEXT) \
        opserv.$(OBJEXT) policer.$(OBJEXT) recdb.$(OBJEXT) \
-       saxdb.$(OBJEXT) sendmail.$(OBJEXT) spamserv.$(OBJEXT) \
+       sar.$(OBJEXT) saxdb.$(OBJEXT) spamserv.$(OBJEXT) \
        shun.$(OBJEXT) timeq.$(OBJEXT) tools.$(OBJEXT) \
        x3ldap.$(OBJEXT)
 x3_OBJECTS = $(am_x3_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PY_CFLAGS) $(AM_CPPFLAGS) \
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(PY_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(PY_LIBS) -o $@
-SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) \
-       $(EXTRA_x3_SOURCES)
-DIST_SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) \
-       $(EXTRA_x3_SOURCES)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(slab_read_SOURCES) \
+       $(x3_SOURCES) $(EXTRA_x3_SOURCES)
+DIST_SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) \
+       $(slab_read_SOURCES) $(x3_SOURCES) $(EXTRA_x3_SOURCES)
 DATA = $(noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -93,6 +95,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CP = @CP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -109,8 +112,6 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-PY_CFLAGS = @PY_CFLAGS@
-PY_LIBS = @PY_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@ @RX_LIBS@
@@ -130,6 +131,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PY_CFLAGS = @PY_CFLAGS@
+PY_LIBS = @PY_LIBS@
 RANLIB = @RANLIB@
 RX_INCLUDES = @RX_INCLUDES@
 RX_LIBS = @RX_LIBS@
@@ -180,6 +183,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pythonpath = @pythonpath@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -192,9 +196,44 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = @RX_INCLUDES@
-noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help spamserv.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help mod-webtv.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)
-EXTRA_x3_SOURCES = alloc-slab.c alloc-x3.c proto-common.c proto-p10.c mod-snoop.c mod-track.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c mod-webtv.c
+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-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 = \
@@ -210,8 +249,9 @@ x3_SOURCES = \
        heap.c heap.h \
        helpfile.c helpfile.h \
        hosthiding.c hosthiding.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 \
@@ -222,8 +262,8 @@ x3_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 \
@@ -231,6 +271,7 @@ x3_SOURCES = \
 
 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
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -291,6 +332,9 @@ checkdb$(EXEEXT): $(checkdb_OBJECTS) $(checkdb_DEPENDENCIES)
 globtest$(EXEEXT): $(globtest_OBJECTS) $(globtest_DEPENDENCIES) 
        @rm -f globtest$(EXEEXT)
        $(LINK) $(globtest_OBJECTS) $(globtest_LDADD) $(LIBS)
+slab-read$(EXEEXT): $(slab_read_OBJECTS) $(slab_read_DEPENDENCIES) 
+       @rm -f slab-read$(EXEEXT)
+       $(LINK) $(slab_read_OBJECTS) $(slab_read_LDADD) $(LIBS)
 x3$(EXEEXT): $(x3_OBJECTS) $(x3_DEPENDENCIES) 
        @rm -f x3$(EXEEXT)
        $(LINK) $(x3_OBJECTS) $(x3_LDADD) $(LIBS)
@@ -317,13 +361,21 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hosthiding.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioset-epoll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioset-kevent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioset-select.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-common.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-sendmail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-helpserv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-memoserv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-python.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-qserver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-snoop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-sockcheck.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod-track.Po@am__quote@
@@ -336,9 +388,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto-p10.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recdb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saxdb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendmail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shun.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slab-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spamserv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timeq.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools.Po@am__quote@