* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index ed01815ce625bcc1efe8b21b9e54c286e640b589..8ba00452b37a275f2a3e00a328d7177482859a5d 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -5,7 +5,7 @@
 # uses "Makefile.in" to generate a "Makefile".  In the rare instance
 # that you have to modify something here, please take note:
 # 1. Edit Makefile.in, -not- Makefile.
-# 2. Send e-mail to ajc@uncnsrd.mt-kisco.ny.us and let me know what you
+# 2. Send e-mail to ajc@uncensored.citadel.org and let me know what you
 #    did, so any necessary changes can be put into the next release.
 #
 # $Id$
@@ -41,7 +41,6 @@ SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
 UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
        stats citmail netpoll mailinglist userlist sendcommand \
        base64 qpdecode
-PROXY_TARGETS=proxy
 
 prefix=@prefix@
 srcdir=@srcdir@
@@ -71,16 +70,17 @@ INSTALL_DATA=@INSTALL_DATA@
 SHELL=/bin/sh
 AUTOCONF=@AUTOCONF@
 YACC=@YACC@
+DATABASE=@DATABASE@
 
 # End configuration section
 
 VPATH=$(srcdir)
 
 SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
-       config.c control.c database.c dynloader.c file_ops.c \
+       config.c control.c $(DATABASE) dynloader.c file_ops.c \
        housekeeping.c internetmail.c ipc_c_tcp.c locate_host.c \
        logging.c mailinglist.c messages.c msgbase.c msgform.c netmailer.c \
-       netpoll.c netproc.c netsetup.c policy.c proxy.c rcit.c readlog.c \
+       netpoll.c netproc.c netsetup.c policy.c rcit.c readlog.c \
        room_ops.c rooms.c routines.c routines2.c serv_chat.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 \
@@ -88,7 +88,8 @@ SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
        auth.c chkpwd.c html.c vcard.c serv_upgrade.c serv_vandelay.c \
        serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
        domain.c clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c \
-       serv_moderate.c client_passwords.c serv_imap.c imap_tools.c \
+       serv_moderate.c client_passwords.c \
+       serv_imap.c imap_tools.c imap_fetch.c imap_search.c \
        serv_network.c serv_pas2.c md5.c
 
 DEP_FILES=$(SOURCES:.c=.d)
@@ -130,7 +131,7 @@ 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 \
+       $(DATABASE:.c=.ro) control.ro logging.ro policy.ro dynloader.ro tools.ro \
        mime_parser.ro html.ro internet_addressing.ro \
        parsedate.ro genstamp.ro clientsocket.ro \
        $(AUTH) $(LIBOBJS:.o=.ro)
@@ -144,15 +145,16 @@ citserver: $(SERV_OBJS)
 .c.ro:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
 
+.c.mo:
+       @mkdir -p modules
+       $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) $(PICFLAGS) -DPIC -c $< -o $@
+
 modules/serv_chat.so: serv_chat.mo
        $(LINK_SHARED) -o modules/serv_chat.so serv_chat.mo
 
 modules/serv_chat.mo: serv_chat.mo
        ln -f serv_chat.mo modules
 
-.c.mo:
-       $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) $(PICFLAGS) -DPIC -c $< -o $@
-
 modules/serv_test.so: serv_test.mo
        $(LINK_SHARED) -o modules/serv_test.so serv_test.mo
 
@@ -231,8 +233,9 @@ modules/serv_smtp.mo: serv_smtp.mo
 modules/domain.mo: domain.mo
        ln -f domain.mo modules
 
-modules/serv_imap.so: serv_imap.mo imap_tools.mo
-       $(LINK_SHARED) -o modules/serv_imap.so imap_tools.mo serv_imap.mo
+modules/serv_imap.so: serv_imap.mo imap_tools.mo imap_fetch.mo imap_search.mo
+       $(LINK_SHARED) -o modules/serv_imap.so imap_tools.mo serv_imap.mo \
+               imap_fetch.mo imap_search.mo
 
 modules/serv_imap.mo: serv_imap.mo
        ln -f serv_imap.mo modules
@@ -240,6 +243,12 @@ modules/serv_imap.mo: serv_imap.mo
 modules/imap_tools.mo: imap_tools.mo
        ln -f imap_tools.mo modules
 
+modules/imap_fetch.mo: imap_fetch.mo
+       ln -f imap_fetch.mo modules
+
+modules/imap_search.mo: imap_search.mo
+       ln -f imap_search.mo modules
+
 aidepost: aidepost.o config.o $(LIBOBJS)
        $(CC) aidepost.o config.o $(LIBOBJS) $(LDFLAGS) -o aidepost
 
@@ -265,7 +274,7 @@ netmailer: netmailer.o internetmail.o config.o genstamp.o
 
 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)
+       $(LIBOBJS) $(LDFLAGS) -o netproc $(NETLIBS)
 
 citmail: citmail.o config.o
        $(CC) citmail.o config.o $(LDFLAGS) -o citmail $(NETLIBS)
@@ -282,9 +291,6 @@ chkpwd: chkpwd.o auth.o config.o
 netsetup: netsetup.o config.o
        $(CC) netsetup.o config.o $(LDFLAGS) -o netsetup
 
-proxy: proxy.o ipc_c_tcp.o
-       $(CC) proxy.o ipc_c_tcp.o $(LDFLAGS) -o proxy $(NETLIBS)
-
 whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(NETLIBS)
 
@@ -321,37 +327,42 @@ install: install-exec install-data install-doc
 install-data:
        @for i in help messages network/spoolin network/spoolout \
                 network/systems; do \
-               ./mkinstalldirs $(root)$(prefix)/$$i; \
+               $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
        done
        @for i in citadel.rc public_clients \
-                `find help messages network -type f | grep -v CVS`; do \
+                `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v CVS`; do \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
        -@if test -d $(root)/etc/pam.d; then \
-               echo $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
-               $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
+               echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \
+               $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \
        fi
 
 install-doc:
-       @./mkinstalldirs $(root)$(prefix)/techdoc
-       @for i in `find techdoc -type f | grep -v CVS`; do \
+       @$(srcdir)/mkinstalldirs $(root)$(prefix)/techdoc
+       @for i in `find $(srcdir)/techdoc -type f | grep -v CVS`; do \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
 
 install-exec: all weekly
        @for i in bio bitbucket files images info modules userpics; do \
-               ./mkinstalldirs $(root)$(prefix)/$$i; \
+               $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
        done
        @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
-                $(PROXY_TARGETS) $(SERV_MODULES) utilsmenu weekly \
-                dnetsetup; do \
+                $(SERV_MODULES) ; do \
                if test -f $$i; then \
                        echo $(INSTALL) $$i $(root)$(prefix)/$$i; \
                        $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
+       @for i in utilsmenu weekly dnetsetup; do \
+               if test -f $(srcdir)/$$i; then \
+                       echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
+                       $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
+               fi \
+       done
        @if test x`find $(root)$(prefix)/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \
                echo chmod u+s $(root)$(prefix)/chkpwd; \
                chmod u+s $(root)$(prefix)/chkpwd; \
@@ -362,7 +373,7 @@ clean:
 
 cleaner: clean
        rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
-               modules/*.[ms]o $(PROXY_TARGETS) so_locations
+               modules/*.[ms]o so_locations
 
 distclean: cleaner
        find . -name '*~' -o -name '.#*' | xargs rm -f