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

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 34458a61c..c21e3dc6d 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.
 #
 ########################################################################
 
@@ -36,18 +36,16 @@ include Make_modules
 
 UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
-UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
+UTILBIN_TARGETS= setup$(EXEEXT) \
 	chkpw$(EXEEXT) chkpwd$(EXEEXT) \
-	aidepost$(EXEEXT) msgform$(EXEEXT) \
 	ctdlmigrate$(EXEEXT)
 
-
 ACLOCAL=@ACLOCAL@
 AUTOCONF=@AUTOCONF@
 chkpwd_LIBS=@chkpwd_LIBS@
 CC=@CC@
-CFLAGS=@CFLAGS@ -I ./include/
-CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
+CFLAGS=@CFLAGS@ -I.
+CPPFLAGS=@CPPFLAGS@ -I.
 DATABASE=@DATABASE@
 DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\"
 LDFLAGS=@LDFLAGS@
@@ -70,19 +68,16 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/aidepost.c 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 \
+SOURCES=utils/citmail.c utils/setup.c utils/chkpw.c \
+	utils/sendcommand.c  utils/ctdlmigrate.c utils/chkpwd.c \
+	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 \
-	context.c netconfig.c nttlist.c md5.c
-
+	context.c netconfig.c
 
 include Make_sources
 
@@ -98,7 +93,7 @@ mkdir-init:
 	@for d in `/bin/ls $(VPATH)/user_modules/`; do \
 		(mkdir -p user_modules/$$d ) ; \
 	done
-	mkdir -p utils utillib
+	mkdir -p utils
 	mkdir locale
 
 svn_revision.c: ${SOURCES}
@@ -116,9 +111,6 @@ utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 	$(YACC) $(YFLAGS) $<
 	mv -f y.tab.c $@
 
-#
-#
-
 parsedate.o: parsedate.c
 
 Make_sources: modules_init.c
@@ -127,16 +119,16 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-SERV_OBJS = server_main.o utillib/citadel_dirs.o \
+SERV_OBJS = server_main.o 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 \
 	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 nttlist.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)
@@ -145,44 +137,35 @@ 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 \
+citmail$(EXEEXT): utils/citmail.o citadel_dirs.o
+	$(CC) utils/citmail.o citadel_dirs.o \
 		$(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
 
 # setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
-setup$(EXEEXT): utils/setup.o utillib/citadel_dirs.o
-	$(CC) utils/setup.o utillib/citadel_dirs.o \
+setup$(EXEEXT): utils/setup.o citadel_dirs.o
+	$(CC) utils/setup.o citadel_dirs.o \
 		$(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
 
-ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o utillib/citadel_dirs.o
-	$(CC) utils/ctdlmigrate.o utillib/citadel_dirs.o \
+ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o citadel_dirs.o
+	$(CC) utils/ctdlmigrate.o citadel_dirs.o \
 		$(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
 
 chkpwd$(EXEEXT): utils/chkpwd.o auth.o
 	$(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
 
-chkpw$(EXEEXT): utils/chkpw.o auth.o utillib/citadel_dirs.o
-	$(CC) utils/chkpw.o auth.o utillib/citadel_dirs.o \
+chkpw$(EXEEXT): utils/chkpw.o auth.o citadel_dirs.o
+	$(CC) utils/chkpw.o auth.o citadel_dirs.o \
 		$(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
-sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS)
-	$(CC) utils/sendcommand.o utillib/citadel_dirs.o \
+sendcommand$(EXEEXT): utils/sendcommand.o citadel_dirs.o $(LIBOBJS)
+	$(CC) utils/sendcommand.o 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; \
@@ -210,28 +193,14 @@ 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 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; \
-	done
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
 	-@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
 
 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$
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
 	@for i in  \
@@ -239,21 +208,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  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 files images info userpics; do \
+	@for i in files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -263,15 +222,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
 
@@ -286,14 +236,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 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 \
@@ -305,7 +251,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 ; do \
 		if test -f $(srcdir)/$$i; then \
 			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
 			$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
@@ -325,7 +271,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; \
@@ -334,7 +279,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; \
@@ -345,7 +290,7 @@ clean:
 	rm -vfr locale/*
 	rm -vf *.o 
 	rm -vf utils/*.o ;\
-	rm -vf utillib/*.o ;\
+	rm -vf *.o ;\
 	for i in $(srcdir)/modules/* ; do \
 		rm -vf $$i/*.o ;\
 	done
@@ -356,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
@@ -364,9 +308,8 @@ cleaner: clean
 distclean: cleaner
 	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 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 -vf $$i/*.d ;\
 	done