* Applied Matt's patches to submit messages to Funambol

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 436d973907a83387b75315a254b3e3d6051301f0..a10bf3cb044c96f818c6bd8a4d6939034e014030 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -35,7 +35,7 @@ SERV_MODULES=serv_chat.o \
        serv_vcard.o vcard.o \
        serv_mrtg.o \
        serv_imap.o imap_fetch.o imap_misc.o imap_search.o \
-               imap_store.o imap_tools.o \
+               imap_store.o imap_acl.o imap_tools.o \
        serv_fulltext.o ft_wordbreaker.o crc16.o \
        serv_network.o \
        serv_listsub.o \
@@ -53,7 +53,8 @@ SERV_MODULES=serv_chat.o \
        serv_managesieve.o \
        ical_dezonify.o \
        serv_ldap.o \
-       serv_autocompletion.o 
+       serv_autocompletion.o \
+       serv_funambol.o
 
 UTIL_TARGETS=aidepost msgform \
        citmail userlist sendcommand \
@@ -102,7 +103,7 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
        serv_newuser.c serv_pas2.c serv_pop3.c serv_rwho.c serv_smtp.c \
        serv_spam.c serv_test.c serv_mrtg.c serv_spam.c serv_upgrade.c \
        serv_vandelay.c serv_vcard.c serv_managesieve.c server_main.c \
-       serv_sieve.c setup.c snprintf.c \
+       serv_sieve.c serv_funambol.c setup.c snprintf.c imap_acl.c \
        stress.c support.c sysdep.c tools.c user_ops.c userlist.c \
        whobbs.c vcard.c serv_notes.c serv_fulltext.c ft_wordbreaker.c \
        crc16.c journaling.c citadel_dirs.c
@@ -226,12 +227,12 @@ install-data-new:
        $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
        $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
 
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/help
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/messages
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/help
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/messages
        @for i in  \
                 `find $(srcdir)/help $(srcdir)/messages  -type f | grep -v .svn`; do \
-               echo $(INSTALL_DATA) $$i $(DESTDIR)$(DATA_DIR)/$$i; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(DATA_DIR)/$$i; \
+               echo $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
@@ -281,7 +282,7 @@ install-exec: all
                        $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
                fi \
        done
-       @for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \
+       @for i in utilsmenu database_cleanup.sh citadel-openldap.schema; do \
                if test -f $(srcdir)/$$i; then \
                        echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
                        $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \