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 4e0743d255fbf86e65786fb4209c4fb08d988f08..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@
@@ -43,8 +47,6 @@ UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
        getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \
        ctdlmigrate$(EXEEXT)
 
-prefix=@prefix@
-srcdir=@srcdir@
 
 ACLOCAL=@ACLOCAL@
 AUTH=@AUTH@
@@ -69,7 +71,6 @@ 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 \
@@ -87,6 +88,14 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.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
 
@@ -207,7 +216,7 @@ install-data:
                 network/systems; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
-       @for i in funambol_newmail_soap.xml 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; \
@@ -234,7 +243,7 @@ install-data-new:
        done
 
        $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-       @for i in  funambol_newmail_soap.xml \
+       @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; \
@@ -345,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)
 
 
@@ -358,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 $<