X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=8f671a23e3216d98590eeba08e93b72e9de38946;hb=82fb7a6f7288522abdedd30193579b1a14de091e;hp=f6a90d416c4aa112f758cc49332dfcaf6173024c;hpb=d348dc8f65670219d5234c0f11fc73fab734e478;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index f6a90d416..8f671a23e 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -1,4 +1,6 @@
-# $Id$
+prefix=@prefix@
+srcdir=@srcdir@
+VPATH=$(srcdir)
 
 AUTOCONF=@AUTOCONF@
 CC=@CC@
@@ -11,19 +13,28 @@ LDFLAGS=@LDFLAGS@
 SED=@SED@
 SETUP_LIBS=@SETUP_LIBS@
 PTHREAD_DEFS=@PTHREAD_DEFS@
-srcdir=@srcdir@
-prefix=@prefix@
-top_builddir=`pwd`
 LIB_SUBDIRS=
 PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 LOCALEDIR=@LOCALEDIR@
 WWWDIR=@WWWDIR@
+HEADERS=calendar.h  dav.h  messages.h  modules_init.h  paramhandling.h  preferences.h  roomops.h  subst.h  sysdep.h  tcp_sockets.h  utils.h  webcit.h  webserver.h
 
 # End of configuration section
 
-all: all-progs-recursive webcit setup
+all: buildinfo all-progs-recursive webcit setup
+
+buildinfo:
+	echo
+	echo Compiler: 	$(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@
+	echo Linker: 	$(CC) $(LDFLAGS) $(LIBOBJS) 	$(LIBS)
+	echo
 
+# for VPATH builds (invoked by configure)
+mkdir-init:
+	mkdir locale
+
+.SILENT:
 
 .SUFFIXES: .cpp .c .o
 
@@ -33,49 +44,53 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
-		po/Makefile \
+		po/webcit/Makefile \
 		$(srcdir)/TAGS
 
 setup: setup.o gettext.o
-	$(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) $(SETUP_LIBS) \
-	gettext.o setup.o -o setup
+	$(CC) $(LDFLAGS) $(LIBOBJS) gettext.o setup.o -o setup \
+	$(LIBS) $(SETUP_LIBS)
 
 webcit: webserver.o context_loop.o ical_dezonify.o \
-	cookie_conversion.o locate_host.o floors.o summary.o \
-	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
-	roomops.o messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
-	useredit.o vcard_edit.o preferences.o html2html.o listsub.o \
-	graphics.o netconf.o siteconfig.o subst.o \
-	calendar.o calendar_tools.o calendar_view.o event.o smtpqueue.o \
+	cookie_conversion.o locate_host.o summary.o \
+	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o marchlist.o \
+	roomops.o roomlist.o roomtokens.o roomviews.o blogview_renderer.o \
+	messages.o msg_renderers.o paging.o sysmsgs.o \
+	useredit.o vcard_edit.o preferences.o html2html.o listsub.o roomchat.o \
+	graphics.o netconf.o siteconfig.o subst.o bbsview_renderer.o \
+	calendar.o calendar_tools.o calendar_view.o tasks.o event.o smtpqueue.o \
 	availability.o iconbar.o crypto.o inetconf.o notes.o wiki.o \
-	groupdav_main.o groupdav_get.o groupdav_propfind.o fmt_date.o \
-	groupdav_options.o autocompletion.o gettext.o tabs.o sieve.o \
-	groupdav_delete.o groupdav_put.o http_datestring.o setup_wizard.o \
+	dav_main.o dav_get.o dav_propfind.o dav_report.o fmt_date.o \
+	dav_options.o autocompletion.o gettext.o tabs.o sieve.o sitemap.o \
+	dav_delete.o dav_put.o http_datestring.o setup_wizard.o \
 	downloads.o addressbook_popup.o pushemail.o sysdep.o openid.o \
 	decode.o modules_init.o paramhandling.o utils.o \
-	ical_maps.o ical_subst.o static.o \
+	ical_maps.o ical_subst.o static.o feed_generator.o \
 	$(LIBOBJS)
-	$(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) \
-	webserver.o context_loop.o cookie_conversion.o \
+	echo LD: webcit
+	$(CC) $(LDFLAGS) -o webcit $(LIBOBJS) \
+	webserver.o context_loop.o cookie_conversion.o marchlist.o \
 	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \
-	roomops.o messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
-	useredit.o locate_host.o siteconfig.o subst.o vcard_edit.o floors.o \
-	graphics.o netconf.o preferences.o html2html.o openid.o \
-	summary.o calendar.o calendar_tools.o calendar_view.o event.o wiki.o \
+	roomops.o roomlist.o roomtokens.o roomviews.o blogview_renderer.o \
+	messages.o msg_renderers.o paging.o sysmsgs.o \
+	useredit.o locate_host.o siteconfig.o subst.o vcard_edit.o roomchat.o \
+	graphics.o netconf.o preferences.o html2html.o openid.o bbsview_renderer.o \
+	summary.o calendar.o calendar_tools.o calendar_view.o tasks.o event.o wiki.o \
 	availability.o ical_dezonify.o iconbar.o crypto.o inetconf.o notes.o \
-	groupdav_main.o groupdav_get.o groupdav_propfind.o groupdav_delete.o \
-	groupdav_options.o autocompletion.o tabs.o smtpqueue.o sieve.o \
-	groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o modules_init.o \
+	dav_main.o dav_get.o dav_propfind.o dav_report.o dav_delete.o \
+	dav_options.o autocompletion.o tabs.o smtpqueue.o sieve.o sitemap.o \
+	dav_put.o http_datestring.o setup_wizard.o fmt_date.o modules_init.o \
 	gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o decode.o \
-	paramhandling.o utils.o ical_maps.o ical_subst.o static.o \
-	-o webcit \
+	paramhandling.o utils.o ical_maps.o ical_subst.o static.o feed_generator.o \
 	$(LIBS)
 
-.c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
+%.o: %.c ${HEADERS}
+	echo "CC $<"
+	$(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<
 
-.cpp.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
+%.o: %.cpp ${HEADERS}
+	echo "CC+ $<"
+	$(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -107,6 +122,10 @@ install-setupbin: install-bin
 install-wwwdata:
 	test -d $(DESTDIR)$(WWWDIR)/static.local/t || mkdir -p $(DESTDIR)$(WWWDIR)/static.local/t
 	test -d $(DESTDIR)$(WWWDIR)/static/t || mkdir -p $(DESTDIR)$(WWWDIR)/static/t
+	for i in `find static -type d | grep -v .svn` \
+		; do \
+		test -d $(DESTDIR)$(WWWDIR)/$$i || mkdir -p $(DESTDIR)$(WWWDIR)/$$i; \
+	done
 	for i in `find static -type f | grep -v .svn`; do \
 		$(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
 	done
@@ -124,7 +143,7 @@ install-tinymce:
 	done
 
 install-locale:
-	cd po; make
+	cd po/webcit/; $(MAKE)
 	for i in `find locale -type d | grep -v .svn` \
 		; do \
 		test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \