Fix the Makefile.in to properly clean the user_modules tree.

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index a7a3f049d9f0485befa68cee5ffbed71cdc4d28f..0d7c57fb845da9c61426d1414fc171fea628a592 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -12,6 +12,10 @@
 #
 ########################################################################
 
+prefix=@prefix@
+srcdir=@srcdir@
+VPATH=$(srcdir)
+
 TARGETS=@TARGETS@
 RUN_DIR=@MAKE_RUN_DIR@
 SPOOL_DIR=@MAKE_SPOOL_DIR@
@@ -40,10 +44,9 @@ UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
 UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
        chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \
-       getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT)
+       getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \
+       ctdlmigrate$(EXEEXT)
 
-prefix=@prefix@
-srcdir=@srcdir@
 
 ACLOCAL=@ACLOCAL@
 AUTH=@AUTH@
@@ -68,27 +71,31 @@ YACC=@YACC@
 
 # End configuration section
 
-VPATH=$(srcdir)
 
 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 \
-       journaling.c citadel_dirs.c threads.c
+       whobbs.c journaling.c citadel_dirs.c threads.c ctdlmigrate.c
 
 
 include Make_sources
 
+# for VPATH builds (invoked by configure)
+mkdir-init:
+       DIRS=`/bin/ls $(VPATH)/modules/`
+       echo $(DIRS)
+       @for d in `/bin/ls $(VPATH)/modules/`; do \
+               (mkdir -p modules/$$d ) ; \
+       done
+
 svn_revision.c: ${SOURCES}
        ./mk_svn_revision.sh
 
@@ -133,7 +140,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)
@@ -151,6 +158,9 @@ citmail$(EXEEXT): citmail.o citadel_dirs.o
 setup$(EXEEXT): setup.o citadel_dirs.o
        $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
 
+ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o
+       $(CC) ctdlmigrate.o citadel_dirs.o $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
+
 chkpwd$(EXEEXT): chkpwd.o auth.o
        $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
 
@@ -206,7 +216,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 notify_about_newmail.js 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; \
@@ -233,7 +243,7 @@ install-data-new:
        done
 
        $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-       @for i in  \
+       @for i in  funambol_newmail_soap.xml notify_about_newmail.js \
                 `find $(srcdir)/help -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
@@ -344,6 +354,11 @@ clean:
        for i in $(srcdir)/modules/* ; do \
                rm -f $$i/*.o ;\
        done
+       if test -d $(srcdir)/user_modules ; then \
+               for i in $(srcdir)/user_modules/* ; do \
+                       rm -f $$i/*.o ;\
+               done \
+       fi
        rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
 
@@ -357,6 +372,11 @@ distclean: cleaner
        for i in $(srcdir)/modules/* ; do \
                rm -f $$i/*.d ;\
        done
+       if test -d $(srcdir)/user_modules ; then \
+               for i in $(srcdir)/user_modules/* ; do \
+                       rm -f $$i/*.o ;\
+               done \
+       fi
 
 .c.d:
        @echo Checking dependencies for $<