dont abort

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index f6b2f361ebaf77b42fdd8d434fba5cba69b65ac6..cb6c8fe619c731772a886af91295f4bc0b0bbf82 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -19,7 +19,7 @@ SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS)
 LOCALEDIR=@LOCALEDIR@
 WWWDIR=@WWWDIR@
 ETCDIR=@ETCDIR@
-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
+HEADERS=calendar.h  dav.h  messages.h  modules_init.h  paramhandling.h  preferences.h  roomops.h  subst.h  sysdep.h  sockets.h  utils.h  webcit.h  webserver.h
 
 # End of configuration section
 
@@ -51,7 +51,7 @@ distclean: clean
 
 webcit: webserver.o context_loop.o ical_dezonify.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 \
+       webcit.o auth.o sockets.o mainmenu.o serv_func.o who.o marchlist.o \
        roomops.o roomlist.o roomtokens.o roomviews.o \
        blogview_renderer.o msg_renderers.o jsonview_renderer.o mailview_renderer.o bbsview_renderer.o \
        messages.o paging.o sysmsgs.o \
@@ -63,13 +63,13 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
        dav_options.o autocompletion.o gettext.o tabs.o sieve.o sitemap.o \
        dav_delete.o dav_put.o http_datestring.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 feed_generator.o \
+       modules_init.o paramhandling.o utils.o \
+       ical_ctdl_is_overlap.o ical_maps.o ical_subst.o static.o feed_generator.o \
        $(LIBOBJS)
        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 \
+       webcit.o auth.o sockets.o mainmenu.o serv_func.o who.o listsub.o \
        roomops.o roomlist.o roomtokens.o roomviews.o \
        messages.o msg_renderers.o paging.o sysmsgs.o \
        blogview_renderer.o jsonview_renderer.o mailview_renderer.o bbsview_renderer.o \
@@ -80,8 +80,8 @@ webcit: webserver.o context_loop.o ical_dezonify.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 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 feed_generator.o \
+       gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o \
+       ical_ctdl_is_overlap.o paramhandling.o utils.o ical_maps.o ical_subst.o static.o feed_generator.o \
        $(LIBS)
 
 ical_maps.c: scripts/get_ical_data.sh
@@ -107,7 +107,7 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
-install:  install-bin install-setupbin install-wwwdata install-tinymce install-locale install-cfg
+install:  install-bin install-wwwdata install-tinymce install-locale install-cfg
 
 install-bin:
        test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
@@ -121,10 +121,6 @@ install-cfg:
        test -d $(DESTDIR)$(ETCDIR) || mkdir -p $(DESTDIR)$(ETCDIR)
        $(INSTALL) nogz-mimetypes.txt $(DESTDIR)/$(ETCDIR)/nogz-mimetypes.txt
 
-install-setupbin: install-bin
-       $(INSTALL) setup $(DESTDIR)$(prefix)/setup
-
-
 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