* Replaced citmail.c with a new one that simply SMTP-forwards to Citadel

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index f2f49c7dfc48a13d3752748f4c6d95b2baf90130..bc76559e9159f78c72bfd54853f9e9099ca91e0a 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -21,11 +21,14 @@ all: $(TARGETS)
 
 EXEEXT=@EXEEXT@
 SO=@SO@
+SERV_ICQ=@SERV_ICQ@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
 SERVER_TARGETS=citserver setup $(CHKPWD)
 SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
-       modules/serv_expire$(SO) modules/serv_icq$(SO)
+       modules/serv_upgrade$(SO) \
+       modules/serv_smtp$(SO) modules/serv_pop3$(SO) \
+       modules/serv_expire$(SO) $(SERV_ICQ)
 UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
        stats citmail netpoll mailinglist userlist sendcommand \
        base64 qpdecode
@@ -68,7 +71,8 @@ SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
        serv_info.c serv_test.c setup.c snprintf.c stats.c serv_vcard.c \
        support.c sysdep.c tools.c user_ops.c userlist.c serv_expire.c \
        whobbs.c sendcommand.c mime_parser.c base64.c qpdecode.c getutline.c \
-       auth.c chkpwd.c client_icq.c html.c vcard.c
+       auth.c chkpwd.c client_icq.c html.c vcard.c serv_upgrade.c \
+       serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c
 
 DEP_FILES=$(SOURCES:.c=.d)
 
@@ -104,7 +108,9 @@ netpoll: netpoll.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
 SERV_OBJS = citserver.ro user_ops.ro support.ro room_ops.ro file_ops.ro \
        msgbase.ro config.ro sysdep.ro locate_host.ro housekeeping.ro \
        database.ro control.ro logging.ro policy.ro dynloader.ro tools.ro \
-       mime_parser.ro html.ro vcard.ro $(AUTH) $(LIBOBJS:.o=.ro)
+       mime_parser.ro html.ro internet_addressing.ro \
+       parsedate.ro genstamp.ro \
+       $(AUTH) $(LIBOBJS:.o=.ro)
 
 citserver: $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(NETLIBS) $(GDBM) -o citserver
@@ -127,6 +133,18 @@ modules/serv_test.so: serv_test.mo
 modules/serv_test.mo: serv_test.mo
        ln -f serv_test.mo modules
 
+modules/serv_smtp.so: serv_smtp.mo
+       $(LINK_SHARED) -o modules/serv_smtp.so serv_smtp.mo
+
+modules/serv_smtp.mo: serv_smtp.mo
+       ln -f serv_smtp.mo modules
+
+modules/serv_pop3.so: serv_pop3.mo
+       $(LINK_SHARED) -o modules/serv_pop3.so serv_pop3.mo
+
+modules/serv_pop3.mo: serv_pop3.mo
+       ln -f serv_pop3.mo modules
+
 modules/serv_expire.so: serv_expire.mo
        $(LINK_SHARED) -o modules/serv_expire.so serv_expire.mo
 
@@ -139,12 +157,21 @@ modules/serv_icq.so: serv_icq.mo
 modules/serv_icq.mo: serv_icq.mo
        ln -f serv_icq.mo modules
 
-modules/serv_vcard.so: serv_vcard.mo
-       $(LINK_SHARED) -o modules/serv_vcard.so serv_vcard.mo
+modules/serv_upgrade.so: serv_upgrade.mo
+       $(LINK_SHARED) -o modules/serv_upgrade.so serv_upgrade.mo
+
+modules/serv_upgrade.mo: serv_upgrade.mo
+       ln -f serv_upgrade.mo modules
+
+modules/serv_vcard.so: serv_vcard.mo vcard.mo
+       $(LINK_SHARED) -o modules/serv_vcard.so serv_vcard.mo vcard.mo
 
 modules/serv_vcard.mo: serv_vcard.mo
        ln -f serv_vcard.mo modules
 
+modules/vcard.mo: vcard.mo
+       ln -f vcard.mo modules
+
 aidepost: aidepost.o config.o $(LIBOBJS)
        $(CC) aidepost.o config.o $(LIBOBJS) $(LDFLAGS) -o aidepost
 
@@ -153,20 +180,21 @@ aidepost: aidepost.o config.o $(LIBOBJS)
 # mail.  If it is not run setuid, all outgoing mail may always show as coming
 # from your BBSUID rather than the actual sending user.
 #
-netmailer: netmailer.o internetmail.o config.o
-       $(CC) netmailer.o config.o internetmail.o $(LDFLAGS) -o netmailer
+netmailer: netmailer.o internetmail.o config.o genstamp.o
+       $(CC) netmailer.o config.o internetmail.o genstamp.o \
+       $(LDFLAGS) -o netmailer
 
 netproc: netproc.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) netproc.o config.o ipc_c_tcp.o tools.o \
        $(LIBOBJS) $(LDFLAGS) -o netproc $(NETLIBS) $(GDBM)
 
-citmail: citmail.o config.o internetmail.o $(LIBOBJS)
+citmail: citmail.o
        @echo "*"
        @echo "*                 ###### IMPORTANT ######"
        @echo "* To allow Citadel users to receive Internet mail, you must"
        @echo "* set this program to be your local mail delivery agent."
        @echo "*"
-       $(CC) citmail.o config.o internetmail.o $(LIBOBJS) $(LDFLAGS) -o citmail
+       $(CC) citmail.o $(LDFLAGS) -o citmail
 
 mailinglist: mailinglist.o config.o internetmail.o
        $(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist