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

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 16ca85fd3..b110ee118 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -1,12 +1,12 @@
-# Makefile for Citadel
+########################################################################
+#
+# Makefile for Citadel Server
 #
 # NOTE: normally you should not have to modify the Makefile.  All
 # system-dependent configuration is in the "configure" script, which
 # uses "Makefile.in" to generate a "Makefile".  In the rare instance
-# that you have to modify something here, please take note:
-# 1. Edit Makefile.in, -not- Makefile.
-# 2. Send e-mail to ajc@uncensored.citadel.org and let me know what you
-#    did, so any necessary changes can be put into the next release.
+# that you have to modify something here, please edit Makefile.in,
+# *not* Makefile.
 #
 ########################################################################
 
@@ -68,10 +68,8 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/citmail.c \
-	utils/setup.c utils/chkpw.c \
-	utils/sendcommand.c \
-	utils/ctdlmigrate.c utils/chkpwd.c \
+SOURCES=utils/citmail.c utils/setup.c utils/chkpw.c \
+	utils/sendcommand.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 \
@@ -79,8 +77,7 @@ SOURCES=utils/citmail.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 netconfig.c md5.c
-
+	context.c netconfig.c
 
 include Make_sources
 
@@ -114,9 +111,6 @@ utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 	$(YACC) $(YFLAGS) $<
 	mv -f y.tab.c $@
 
-#
-#
-
 parsedate.o: parsedate.c
 
 Make_sources: modules_init.c
@@ -134,7 +128,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o \
 	internet_addressing.o journaling.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
+	svn_revision.o ldap.o netconfig.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
 	$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
@@ -200,11 +194,6 @@ upgrade: install-exec install-doc
 
 install-data:
 	$(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; \
-	done
 	-@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; \
@@ -212,8 +201,6 @@ install-data:
 
 install-data-new:
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
-	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
-	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
 	@for i in  \
@@ -314,7 +301,6 @@ clean:
 	fi
 	rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
-
 cleaner: clean
 	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