X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=e015498864058f61929f45f34961e89d002358e5;hb=8ce55d0a3cc3011b8e8bb08106f6a067f68d9df9;hp=6b2a321b9be78e6a9eb4f9ba5f68b9e3e4a7c5c3;hpb=4bb58f061555ed9770803727c1408ede497deb32;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 6b2a321b9..e01549886 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -1,5 +1,9 @@
 # $Id$
 
+prefix=@prefix@
+srcdir=@srcdir@
+VPATH=$(srcdir)
+
 AUTOCONF=@AUTOCONF@
 CC=@CC@
 CFLAGS=@CFLAGS@
@@ -11,9 +15,6 @@ 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) 
@@ -22,13 +23,17 @@ WWWDIR=@WWWDIR@
 
 # End of configuration section
 
-all: all-progs-recursive webserver setup
+all: all-progs-recursive webcit setup
+
+# for VPATH builds (invoked by configure)
+mkdir-init:
+	mkdir locale
 
 
 .SUFFIXES: .cpp .c .o
 
 clean:
-	rm -f *.o webcit webserver setup
+	rm -f *.o webcit webcit setup
 	rm -fr locale/*
 
 distclean: clean
@@ -36,35 +41,39 @@ distclean: clean
 		po/Makefile \
 		$(srcdir)/TAGS
 
-setup: setup.o
-	$(CC) setup.o \
-	$(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
+setup: setup.o gettext.o
+	$(CC) $(LDFLAGS) $(LIBOBJS) gettext.o setup.o -o setup \
+	$(LIBS) $(SETUP_LIBS)
 
-webserver: webserver.o context_loop.o ical_dezonify.o \
+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 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 rss.o \
-	calendar.o calendar_tools.o calendar_view.o event.o smtpqueue.o \
+	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o marchlist.o \
+	roomops.o roomlist.o messages.o msg_renderers.o userlist.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 \
-	downloads.o  addressbook_popup.o pushemail.o sysdep.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 \
 	$(LIBOBJS)
-	$(CC) webserver.o context_loop.o cookie_conversion.o \
+	$(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 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 rss.o \
-	summary.o calendar.o calendar_tools.o calendar_view.o event.o wiki.o \
+	roomops.o roomlist.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 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 \
-	gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o \
-	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
+	groupdav_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 \
+	$(LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
@@ -88,7 +97,11 @@ install:  install-bin install-setupbin install-wwwdata install-tinymce install-l
 
 install-bin:
 	test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
-	$(INSTALL) webserver $(DESTDIR)$(prefix)/webserver
+	$(INSTALL) webcit $(DESTDIR)$(prefix)/webcit
+	if test -f $(DESTDIR)$(prefix)/webserver; then \
+		rm -f $(DESTDIR)$(prefix)/webserver; \
+		ln -s $(DESTDIR)$(prefix)/webcit $(DESTDIR)$(prefix)/webserver; \
+	fi
 
 
 install-setupbin: install-bin
@@ -96,8 +109,12 @@ install-setupbin: install-bin
 
 
 install-wwwdata:
-	test -d $(DESTDIR)$(WWWDIR)/static.local || mkdir -p $(DESTDIR)$(WWWDIR)/static.local
-	test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static
+	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
@@ -115,7 +132,7 @@ install-tinymce:
 	done
 
 install-locale:
-	cd po; make
+	cd po; $(MAKE)
 	for i in `find locale -type d | grep -v .svn` \
 		; do \
 		test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \