X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=8c3e405bdc27369de8e5c665dfef8379f08c36e8;hb=82fb7a6f7288522abdedd30193579b1a14de091e;hp=cb952e569a6a3f91a7fc104db1c11d6b99ee041c;hpb=1421d26887f154439d2cd27075c7e85dc22f644f;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index cb952e569..8c3e405bd 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,7 +24,7 @@ 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
 
@@ -49,14 +47,13 @@ UTILBIN_TARGETS= base64$(EXEEXT) setup$(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,9 +65,14 @@ 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=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
 	utils/setup.c utils/msgform.c utils/chkpw.c \
@@ -84,10 +86,10 @@ SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
 	domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \
 	housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
-	locate_host.c md5.c auth.c msgbase.c parsedate.c policy.c \
+	locate_host.c md5.c auth.c msgbase.c parsedate.c \
 	room_ops.c euidindex.c server_main.c snprintf.c ldap.c \
 	support.c sysdep.c user_ops.c journaling.c threads.c \
-	context.c
+	context.c event_client.c
 
 
 include Make_sources
@@ -105,9 +107,10 @@ mkdir-init:
 		(mkdir -p user_modules/$$d ) ; \
 	done
 	mkdir -p utils utillib textclient
+	mkdir locale
 
 svn_revision.c: ${SOURCES}
-	./scripts/mk_svn_revision.sh
+	$(srcdir)/scripts/mk_svn_revision.sh
 
 DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
@@ -147,21 +150,22 @@ 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 utillib/citadel_dirs.o event_client.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 \
+	control.o config.o support.o room_ops.o \
 	file_ops.o msgbase.o euidindex.o \
 	locate_host.o housekeeping.o \
 	internet_addressing.o journaling.o \
 	parsedate.o genstamp.o ecrash.o threads.o context.o \
-	clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
+	clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
 	svn_revision.o ldap.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): utils/aidepost.o config.o
@@ -226,13 +230,23 @@ msgform$(EXEEXT): utils/msgform.o
 
 .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'.
@@ -249,7 +263,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 funambol_newmail_soap.xml notify_about_newmail.js citadel.rc 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; \
@@ -265,6 +279,7 @@ install-data-new:
 	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)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
 	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
 
@@ -383,6 +398,7 @@ install-exec-new: all
 	done
 
 clean:
+	rm -fr locale/*
 	rm -f *.o 
 	rm -f utils/*.o ;\
 	rm -f utillib/*.o ;\
@@ -404,6 +420,7 @@ cleaner: clean
 
 distclean: cleaner
 	find . -name '*~' -o -name '.#*' | xargs rm -f
+	rm -f po/Makefile 
 	rm -f Makefile sysdep.h config.cache config.log config.status *.d 
 	rm -f utils/*.d ;
 	rm -f utillib/*.d ;
@@ -434,4 +451,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 "Complie: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
+	echo "LDFLAGS: $(LDFLAGS)"
+	echo
+
 -include $(DEP_FILES)