removed floors.o from Makefile.in, since floors.c was removed

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 4940c49aa9e28875e225f21750828f84e1c08614..7ef54a695cb271220451322c2634db0ac6896b14 100644 (file)
--- 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) 
@@ -24,6 +25,10 @@ WWWDIR=@WWWDIR@
 
 all: all-progs-recursive webcit setup
 
+# for VPATH builds (invoked by configure)
+mkdir-init:
+       mkdir locale
+
 
 .SUFFIXES: .cpp .c .o
 
@@ -37,15 +42,15 @@ distclean: clean
                $(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 \
+       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 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 \
@@ -55,12 +60,12 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
        decode.o modules_init.o paramhandling.o utils.o \
        ical_maps.o ical_subst.o static.o \
        $(LIBOBJS)
-       $(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) \
-       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 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 \
+       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 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 \
@@ -68,7 +73,6 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
        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 \
-       -o webcit \
        $(LIBS)
 
 .c.o:
@@ -107,6 +111,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 +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; \