* Merge LDAP code; bindings are not yet complete

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index ac17fac41a085c4efa0460e444bd986b63acd4f7..8b227a0faaecb803201765c60322df9a44db888c 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -31,8 +31,7 @@ EXEEXT=@EXEEXT@
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
 NOINST_TARGETS=stress$(EXEEXT)
 SERVER_TARGETS=citserver$(EXEEXT)
-SERV_MODULES=crc16.o \
-       md5.o \
+SERV_MODULES= md5.o \
        ical_dezonify.o
 
 include Make_modules
@@ -75,17 +74,14 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
        citmail.c citserver.c client_chat.c client_passwords.c \
        clientsocket.c commands.c config.c control.c $(DATABASE) \
        domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \
-       housekeeping.c ical_dezonify.c \
-       internet_addressing.c ecrash.c \
+       housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
        ipc_c_tcp.c locate_host.c md5.c messages.c  \
        msgbase.c msgform.c parsedate.c policy.c \
        room_ops.c rooms.c routines.c routines2.c tuiconfig.c euidindex.c \
        screen.c sendcommand.c getmail.c \
-       server_main.c \
-       setup.c snprintf.c \
+       server_main.c setup.c snprintf.c ldap.c \
        stress.c support.c sysdep.c user_ops.c userlist.c \
-       whobbs.c \
-       crc16.c journaling.c citadel_dirs.c threads.c
+       whobbs.c journaling.c citadel_dirs.c threads.c
 
 
 include Make_sources
@@ -134,7 +130,7 @@ SERV_OBJS = server_main.o \
        internet_addressing.o journaling.o \
        parsedate.o genstamp.o ecrash.o threads.o\
        clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
-       svn_revision.o
+       svn_revision.o ldap.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
@@ -207,7 +203,7 @@ install-data:
                 network/systems; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
-       @for i in citadel.rc public_clients \
+       @for i in funambol_newmail_soap.xml citadel.rc public_clients \
                 `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -228,13 +224,13 @@ install-data-new:
 
        $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
        @for i in  \
-                `$(srcdir)/messages  -type f | grep -v .svn`; do \
+                `find $(srcdir)/messages  -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
 
        $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-       @for i in  \
+       @for i in  funambol_newmail_soap.xml \
                 `find $(srcdir)/help -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \