X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=34458a61cbe045570d9d49fabb0d78f204bc51cc;hb=6cd4b62a62098566ed73d7662d22e29fc509b9f3;hp=d6210e08c3629a0c72d620506ec3e454bc22d04a;hpb=6f0f2b51a2ccb6873d3b2c8ecb075535d2516729;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index d6210e08c..34458a61c 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -31,8 +31,6 @@ all: buildinfo $(TARGETS)
 EXEEXT=@EXEEXT@
 
 SERVER_TARGETS=citserver$(EXEEXT)
-SERV_MODULES= md5.o \
-	ical_dezonify.o
 
 include Make_modules
 
@@ -78,12 +76,12 @@ SOURCES=utils/aidepost.c utils/citmail.c \
 	utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \
 	utillib/citadel_dirs.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
-	domain.c serv_extensions.c file_ops.c genstamp.c \
+	domain.c serv_extensions.c genstamp.c \
 	housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
-	locate_host.c md5.c auth.c msgbase.c parsedate.c \
+	locate_host.c auth.c msgbase.c parsedate.c \
 	room_ops.c euidindex.c server_main.c ldap.c \
 	support.c sysdep.c user_ops.c journaling.c threads.c \
-	context.c event_client.c netconfig.c nttlist.c
+	context.c netconfig.c nttlist.c md5.c
 
 
 include Make_sources
@@ -129,16 +127,16 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \
+SERV_OBJS = server_main.o utillib/citadel_dirs.o \
 	user_ops.o citserver.o sysdep.o serv_extensions.o \
 	$(DATABASE:.c=.o) domain.o \
 	control.o config.o support.o room_ops.o \
-	file_ops.o msgbase.o euidindex.o \
-	locate_host.o housekeeping.o \
+	msgbase.o euidindex.o \
+	locate_host.o housekeeping.o ical_dezonify.o \
 	internet_addressing.o journaling.o \
 	parsedate.o genstamp.o ecrash.o threads.o context.o \
 	clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
-	svn_revision.o ldap.o netconfig.o nttlist.o
+	svn_revision.o ldap.o netconfig.o nttlist.o md5.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
 	$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
@@ -216,7 +214,7 @@ install-data:
 		 network/systems; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
-	@for i in funambol_newmail_soap.xml notify_about_newmail.js public_clients citadel_urlshorteners.rc \
+	@for i in notify_about_newmail.js public_clients citadel_urlshorteners.rc \
 		 `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; \
@@ -243,7 +241,7 @@ install-data-new:
 	done
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-	@for i in  funambol_newmail_soap.xml notify_about_newmail.js \
+	@for i in  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; \
@@ -255,7 +253,7 @@ install-data-new:
 		echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 		$(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 	fi
-	@for i in bio bitbucket files images info userpics netconfigs; do \
+	@for i in bio files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -295,7 +293,7 @@ install-doc-new:
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-	@for i in bio bitbucket files images info userpics netconfigs; do \
+	@for i in bio files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
@@ -344,37 +342,37 @@ install-exec-new: all
 	done
 
 clean:
-	rm -fr locale/*
-	rm -f *.o 
-	rm -f utils/*.o ;\
-	rm -f utillib/*.o ;\
+	rm -vfr locale/*
+	rm -vf *.o 
+	rm -vf utils/*.o ;\
+	rm -vf utillib/*.o ;\
 	for i in $(srcdir)/modules/* ; do \
-		rm -f $$i/*.o ;\
+		rm -vf $$i/*.o ;\
 	done
 	if test -d $(srcdir)/user_modules ; then \
 		for i in $(srcdir)/user_modules/* ; do \
-			rm -f $$i/*.o ;\
+			rm -vf $$i/*.o ;\
 		done \
 	fi
-	rm -f $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
+	rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
 
 cleaner: clean
-	rm -rf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
-	rm -rf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
+	rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
+	rm -vrf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
 
 distclean: cleaner
-	find . -name '*~' -o -name '.#*' | xargs rm -f
-	rm -f po/Makefile 
-	rm -f Makefile sysdep.h config.cache config.log config.status *.d 
-	rm -f utils/*.d ;
-	rm -f utillib/*.d ;
+	find . -name '*~' -o -name '.#*' | xargs rm -vf
+	rm -vf po/Makefile 
+	rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d 
+	rm -vf utils/*.d ;
+	rm -vf utillib/*.d ;
 	for i in $(srcdir)/modules/* ; do \
-		rm -f $$i/*.d ;\
+		rm -vf $$i/*.d ;\
 	done
 	if test -d $(srcdir)/user_modules ; then \
 		for i in $(srcdir)/user_modules/* ; do \
-			rm -f $$i/*.o ;\
+			rm -vf $$i/*.o ;\
 		done \
 	fi
 
@@ -398,7 +396,7 @@ $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
 buildinfo:
 	echo
 	echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@"
-	echo "Complie: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
+	echo "Compile: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
 	echo "LDFLAGS: $(LDFLAGS)"
 	echo