X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=9ec7b4f42751e8727dc31dd84ea2c6465af7e7b1;hb=a7d7e3f128e15f282f2a96aba513823aa9603c22;hp=b855fae7c43d05d7990a21eeeccf817ed0035b87;hpb=c7e375305972f782df094cb4c94d68bf42a46ea8;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index b855fae7c..9ec7b4f42 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
 
@@ -40,7 +38,7 @@ UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
 UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
 	chkpw$(EXEEXT) chkpwd$(EXEEXT) \
-	aidepost$(EXEEXT) msgform$(EXEEXT) \
+	msgform$(EXEEXT) \
 	ctdlmigrate$(EXEEXT)
 
 
@@ -72,18 +70,18 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/aidepost.c utils/citmail.c \
+SOURCES=utils/citmail.c \
 	utils/setup.c utils/msgform.c utils/chkpw.c \
 	utils/sendcommand.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 getutline.c \
-	housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
-	locate_host.c md5.c auth.c msgbase.c parsedate.c \
-	room_ops.c euidindex.c server_main.c snprintf.c ldap.c \
+	domain.c serv_extensions.c genstamp.c \
+	housekeeping.c default_timezone.c internet_addressing.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
+	context.c netconfig.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 default_timezone.o \
 	internet_addressing.o journaling.o \
-	parsedate.o genstamp.o ecrash.o threads.o context.o \
+	parsedate.o genstamp.o threads.o context.o \
 	clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
-	svn_revision.o ldap.o
+	svn_revision.o ldap.o netconfig.o md5.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
 	$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
@@ -147,10 +145,6 @@ citserver$(EXEEXT): $(SERV_OBJS)
 	echo "CC $<"
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-aidepost$(EXEEXT): utils/aidepost.o utillib/citadel_dirs.o
-	$(CC) utils/aidepost.o utillib/citadel_dirs.o \
-		$(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
-
 citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o
 	$(CC) utils/citmail.o utillib/citadel_dirs.o \
 		$(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
@@ -184,7 +178,8 @@ msgform$(EXEEXT): utils/msgform.o
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
 install-locale:
-	cd po/citadel-setup; $(MAKE)
+	cd po/citadel-setup
+	$(MAKE)
 	for i in `find locale -type d | grep -v .svn` \
 		; do \
 		test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \
@@ -212,12 +207,9 @@ upgrade: install-exec install-doc
 	@echo
 
 install-data:
-	@for i in help messages network/spoolin network/spoolout \
-		 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 \
-		 `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
+	@for i in public_clients citadel_urlshorteners.rc \
+		 `find $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
 	done
@@ -227,13 +219,10 @@ install-data:
 	fi
 
 install-data-new:
-	@for i in network/spoolin network/spoolout network/systems; do \
-		$(srcdir)/mkinstalldirs $(DESTDIR)$(RUN_DIR)/$$i; \
-	done
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
 	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
 	$(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc
-	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
+	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
 	@for i in  \
@@ -241,21 +230,11 @@ install-data-new:
 		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  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; \
-	done
-	$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
-	$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
-	$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/systems
 	-@if test -d $(DESTDIR)/etc/pam.d; then \
 		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 files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -265,15 +244,6 @@ install-doc:
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
 	done
-	@$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/techdoc
-	@for i in `find $(srcdir)/techdoc -type f | grep -v .svn`; do \
-		echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
-	done
-	@for i in `cd openldap; find $(srcdir)/ -type f | grep -v .svn`; do \
-		echo $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(prefix)/$$i; \
-		$(INSTALL_DATA) openldap/$$i $(DESTDIR)$(prefix)/$$i; \
-	done
 	echo $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt
 
@@ -288,14 +258,10 @@ install-doc-new:
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \
 	done
-	@for i in `cd openldap; find $(srcdir)/ -type f | grep -v .svn`; do \
-		echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \
-		$(INSTALL_DATA) openldap/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
-	done
 	$(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 files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
@@ -307,7 +273,7 @@ install-exec: all
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/unstripped
 	cp $(SERVER_TARGETS) $(DESTDIR)$(prefix)/unstripped/
 
-	@for i in utilsmenu database_cleanup.sh migrate_aliases.sh citadel-openldap.schema; do \
+	@for i in utilsmenu database_cleanup.sh migrate_aliases.sh; do \
 		if test -f $(srcdir)/$$i; then \
 			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
 			$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
@@ -336,7 +302,7 @@ install-exec-new: all
 	done
 
 	$(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail;
-	@for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \
+	@for i in utilsmenu database_cleanup.sh; do \
 		if test -f $(srcdir)/$$i; then \
 			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
 			$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
@@ -344,37 +310,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 package-version.txt
+	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 +364,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