X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=16ca85fd348707aef67526f468e0e792af0d3962;hb=421c6e0bce6917ae9d09ae066c77fb58b964c399;hp=bfd7da72abf9a4fc0edf5070611722d07ec11ef1;hpb=797b2e5f51c83d2f25f1d29957a2ffd99710e90e;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index bfd7da72a..16ca85fd3 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -36,12 +36,10 @@ include Make_modules
 
 UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
-UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
+UTILBIN_TARGETS= setup$(EXEEXT) \
 	chkpw$(EXEEXT) chkpwd$(EXEEXT) \
-	msgform$(EXEEXT) \
 	ctdlmigrate$(EXEEXT)
 
-
 ACLOCAL=@ACLOCAL@
 AUTOCONF=@AUTOCONF@
 chkpwd_LIBS=@chkpwd_LIBS@
@@ -71,13 +69,13 @@ LOCALEDIR=@LOCALEDIR@
 
 
 SOURCES=utils/citmail.c \
-	utils/setup.c utils/msgform.c utils/chkpw.c \
+	utils/setup.c utils/chkpw.c \
 	utils/sendcommand.c \
-	utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \
+	utils/ctdlmigrate.c utils/chkpwd.c \
 	utillib/citadel_dirs.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
 	domain.c serv_extensions.c genstamp.c \
-	housekeeping.c ical_dezonify.c internet_addressing.c ecrash.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 \
@@ -132,9 +130,9 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o \
 	$(DATABASE:.c=.o) domain.o \
 	control.o config.o support.o room_ops.o \
 	msgbase.o euidindex.o \
-	locate_host.o housekeeping.o ical_dezonify.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 netconfig.o md5.o
 
@@ -169,16 +167,11 @@ sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS)
 	$(CC) utils/sendcommand.o utillib/citadel_dirs.o \
 		$(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
-base64$(EXEEXT): utils/base64.o
-	$(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT)
-
-msgform$(EXEEXT): utils/msgform.o
-	$(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
-
 .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; \
@@ -206,10 +199,8 @@ upgrade: install-exec install-doc
 	@echo
 
 install-data:
-	@for i in messages network/spoolin ; do
-		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
-	done
-	@for i in public_clients citadel_urlshorteners.rc \
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
+	@for i in public_clients \
 		 `find $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -220,13 +211,9 @@ install-data:
 	fi
 
 install-data-new:
-	@for i in network/spoolin 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  \
@@ -234,12 +221,11 @@ install-data-new:
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
 	done
-	$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
 	-@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 files images info userpics; do \
+	@for i in files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -249,11 +235,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
 	echo $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt
 
@@ -271,7 +252,7 @@ install-doc-new:
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-	@for i in bio files images info userpics; do \
+	@for i in files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
@@ -283,7 +264,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; do \
+	@for i in utilsmenu database_cleanup.sh ; do \
 		if test -f $(srcdir)/$$i; then \
 			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
 			$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
@@ -303,7 +284,6 @@ install-exec-new: all
 		fi \
 	done
 	cp citserver $(DESTDIR)/$(UTILBIN_DIR)/citserver.unstripped
-	cp migrate_aliases.sh $(DESTDIR)/$(UTILBIN_DIR)/
 	@for i in $(UTILBIN_TARGETS); do \
 		if test -f $$i; then \
 			echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \