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

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 9ec7b4f42..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,9 +69,9 @@ 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 \
@@ -169,12 +167,6 @@ 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:
@@ -208,7 +200,7 @@ upgrade: install-exec install-doc
 
 install-data:
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
-	@for i in public_clients citadel_urlshorteners.rc \
+	@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; \
@@ -221,7 +213,6 @@ install-data:
 install-data-new:
 	$(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
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
@@ -273,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; \
@@ -293,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; \