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

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 0d7c57fb8..34458a61c 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -8,8 +8,6 @@
 # 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.
 #
-# $Id$
-#
 ########################################################################
 
 prefix=@prefix@
@@ -26,37 +24,32 @@ HELP_DIR=@MAKE_HELP_DIR@
 DOC_DIR=@MAKE_DOC_DIR@
 UTILBIN_DIR=@MAKE_UTILBIN_DIR@
 DEPEND_FLAG=@DEPEND_FLAG@
-all: $(TARGETS)
+all: buildinfo $(TARGETS)
 
 .SUFFIXES: .o .d .c
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
-NOINST_TARGETS=stress$(EXEEXT)
 SERVER_TARGETS=citserver$(EXEEXT)
-SERV_MODULES= md5.o \
-	ical_dezonify.o
 
 include Make_modules
 
 UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
 UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
-	chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \
-	getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \
+	chkpw$(EXEEXT) chkpwd$(EXEEXT) \
+	aidepost$(EXEEXT) msgform$(EXEEXT) \
 	ctdlmigrate$(EXEEXT)
 
 
 ACLOCAL=@ACLOCAL@
-AUTH=@AUTH@
 AUTOCONF=@AUTOCONF@
 chkpwd_LIBS=@chkpwd_LIBS@
 CC=@CC@
 CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
-DEFS=@DEFS@
+DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\"
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
@@ -68,22 +61,27 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
+DIFF=@DIFF@
+PATCH=@PATCH@
+LOCALEDIR=@LOCALEDIR@
 
 # End configuration section
 
+.SILENT:
+
 
-SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
-	citmail.c citserver.c client_chat.c client_passwords.c \
-	clientsocket.c commands.c config.c control.c $(DATABASE) \
-	domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \
+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 \
+	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 \
-	ipc_c_tcp.c locate_host.c md5.c messages.c  \
-	msgbase.c msgform.c parsedate.c policy.c \
-	room_ops.c rooms.c routines.c routines2.c tuiconfig.c euidindex.c \
-	screen.c sendcommand.c getmail.c \
-	server_main.c setup.c snprintf.c ldap.c \
-	stress.c support.c sysdep.c user_ops.c userlist.c \
-	whobbs.c journaling.c citadel_dirs.c threads.c ctdlmigrate.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
 
 
 include Make_sources
@@ -95,27 +93,25 @@ mkdir-init:
 	@for d in `/bin/ls $(VPATH)/modules/`; do \
 		(mkdir -p modules/$$d ) ; \
 	done
+	DIRS=`/bin/ls $(VPATH)/user_modules/`
+	echo $(DIRS)
+	@for d in `/bin/ls $(VPATH)/user_modules/`; do \
+		(mkdir -p user_modules/$$d ) ; \
+	done
+	mkdir -p utils utillib
+	mkdir locale
 
 svn_revision.c: ${SOURCES}
-	./mk_svn_revision.sh
+	$(srcdir)/scripts/mk_svn_revision.sh
 
 DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
 noinst: $(NOINST_TARGETS)
-client: $(CLIENT_TARGETS)
 
 server: $(SERVER_TARGETS) $(SERV_MODULES)
 
 utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 
-citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \
-	commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
-	routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS)
-	$(CC) citadel.o citadel_ipc.o client_chat.o client_passwords.o \
-	commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
-	routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) \
-	$(LDFLAGS) -o citadel $(LIBS)
-
 .y.c:
 	$(YACC) $(YFLAGS) $<
 	mv -f y.tab.c $@
@@ -131,75 +127,77 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-SERV_OBJS = server_main.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 policy.o config.o support.o room_ops.o \
-	file_ops.o msgbase.o euidindex.o \
-	locate_host.o housekeeping.o \
+	control.o config.o support.o room_ops.o \
+	msgbase.o euidindex.o \
+	locate_host.o housekeeping.o ical_dezonify.o \
 	internet_addressing.o journaling.o \
-	parsedate.o genstamp.o ecrash.o threads.o\
-	clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
-	svn_revision.o ldap.o
+	parsedate.o genstamp.o ecrash.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
 
 citserver$(EXEEXT): $(SERV_OBJS)
 	$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
 
-.c.o:
+%.o: %.c ${HEADERS}
+	echo "CC $<"
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-aidepost$(EXEEXT): aidepost.o config.o
-	$(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
+aidepost$(EXEEXT): utils/aidepost.o utillib/citadel_dirs.o
+	$(CC) utils/aidepost.o utillib/citadel_dirs.o \
+		$(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
 
-citmail$(EXEEXT): citmail.o citadel_dirs.o
-	$(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
+citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o
+	$(CC) utils/citmail.o utillib/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): setup.o citadel_dirs.o
-	$(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
-
-ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o
-	$(CC) ctdlmigrate.o citadel_dirs.o $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
-
-chkpwd$(EXEEXT): chkpwd.o auth.o
-	$(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
-
-chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o
-	$(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
+setup$(EXEEXT): utils/setup.o utillib/citadel_dirs.o
+	$(CC) utils/setup.o utillib/citadel_dirs.o \
+		$(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
 
-whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-	$(CC) whobbs.o ipc_c_tcp.o citadel_ipc.o  citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS)
+ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o utillib/citadel_dirs.o
+	$(CC) utils/ctdlmigrate.o utillib/citadel_dirs.o \
+		$(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
 
-stress$(EXEEXT): stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-	$(CC) stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress$(EXEEXT) $(LIBS)
+chkpwd$(EXEEXT): utils/chkpwd.o auth.o
+	$(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
 
-sendcommand$(EXEEXT): sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
-	$(CC) sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  \
-	 citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
+chkpw$(EXEEXT): utils/chkpw.o auth.o utillib/citadel_dirs.o
+	$(CC) utils/chkpw.o auth.o utillib/citadel_dirs.o \
+		$(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
-getmail$(EXEEXT): getmail.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
-	$(CC) getmail.o ipc_c_tcp.o citadel_ipc.o config.o  \
-	 citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS)
+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): base64.o
-	$(CC) base64.o $(LDFLAGS) -o base64$(EXEEXT)
+base64$(EXEEXT): utils/base64.o
+	$(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT)
 
-userlist$(EXEEXT): userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-	$(CC) userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o \
-	$(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS)
-
-msgform$(EXEEXT): msgform.o
-	$(CC) msgform.o $(LDFLAGS) -o msgform$(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: install-exec install-data install-doc
+install-locale:
+	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; \
+	done
+	for i in `find locale -type f | grep -v .svn`; do \
+		$(INSTALL) $$i $(DESTDIR)$(LOCALEDIR)/$$i; \
+	done
+
+install: install-exec install-data install-doc install-locale
 	@echo 
 	@echo Installation is complete.
 	@echo Now go to your Citadel directory and run 'setup'.
 	@echo 
 
-install-new: install-exec-new install-data-new install-doc-new
+install-new: install-exec-new install-data-new install-doc-new install-locale
 	@echo 
 	@echo Installation is complete.
 	@echo Now go to your Citadel directory and run 'setup'.
@@ -216,7 +214,7 @@ install-data:
 		 network/systems; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
-	@for i in funambol_newmail_soap.xml notify_about_newmail.js citadel.rc public_clients \
+	@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; \
@@ -232,7 +230,7 @@ install-data-new:
 	done
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
 	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
-	$(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
+	$(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
@@ -243,7 +241,7 @@ install-data-new:
 	done
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-	@for i in  funambol_newmail_soap.xml notify_about_newmail.js \
+	@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; \
@@ -255,7 +253,7 @@ install-data-new:
 		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; do \
+	@for i in bio files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -295,10 +293,10 @@ install-doc-new:
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-	@for i in bio bitbucket files images info userpics; do \
+	@for i in bio files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
-	@for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
+	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
 		if test -f $$i; then \
 			echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
 			$(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -336,12 +334,6 @@ install-exec-new: all
 	done
 
 	$(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail;
-	@for i in $(CLIENT_TARGETS); do \
-		if test -f $$i; then \
-			echo $(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \
-			$(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \
-		fi \
-	done
 	@for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \
 		if test -f $(srcdir)/$$i; then \
 			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
@@ -350,31 +342,37 @@ install-exec-new: all
 	done
 
 clean:
-	rm -f *.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 $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
+	rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
 
 cleaner: clean
-	rm -rf $(CLIENT_TARGETS) $(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 Makefile sysdep.h config.cache config.log config.status *.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 
+	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
 
@@ -395,4 +393,11 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
 	cd $(srcdir) && $(ACLOCAL)
 
+buildinfo:
+	echo
+	echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@"
+	echo "Compile: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
+	echo "LDFLAGS: $(LDFLAGS)"
+	echo
+
 -include $(DEP_FILES)