X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=ef9690cbb46c7a993cab39065bddf4ab452bbc52;hb=HEAD;hp=6a06a785b8b7cea3d7f8101e0b24a9c9a57ee1fa;hpb=1c7e5db568a4a343a86e2e14ccf85e6fc6e94af0;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 6a06a785b..cb6c8fe61 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -18,11 +18,18 @@ PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 LOCALEDIR=@LOCALEDIR@
 WWWDIR=@WWWDIR@
-HEADERS=calendar.h  groupdav.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
+ETCDIR=@ETCDIR@
+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
 
-all: all-progs-recursive webcit setup
+all: buildinfo all-progs-recursive webcit
+
+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:
@@ -33,50 +40,53 @@ mkdir-init:
 .SUFFIXES: .cpp .c .o
 
 clean:
-	rm -f *.o webcit webcit setup
+	rm -f *.o webcit webcit
 	rm -fr locale/*
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
 		po/webcit/Makefile \
+		ical_maps.c \
 		$(srcdir)/TAGS
 
-setup: setup.o gettext.o
-	$(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 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 userlist.o paging.o sysmsgs.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 \
 	useredit.o vcard_edit.o preferences.o html2html.o listsub.o roomchat.o \
-	graphics.o netconf.o siteconfig.o subst.o bbsview_renderer.o \
+	graphics.o netconf.o siteconfig.o subst.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 sitemap.o \
-	groupdav_delete.o groupdav_put.o http_datestring.o setup_wizard.o \
+	availability.o iconbar.o icontheme.o crypto.o inetconf.o notes.o wiki.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 \
 	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 \
-	roomops.o roomlist.o roomtokens.o roomviews.o blogview_renderer.o \
-	messages.o msg_renderers.o userlist.o paging.o sysmsgs.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 \
 	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 \
+	graphics.o netconf.o preferences.o html2html.o openid.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 sitemap.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 feed_generator.o \
+	availability.o ical_dezonify.o iconbar.o icontheme.o crypto.o inetconf.o notes.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 \
+	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
+	sh scripts/get_ical_data.sh
+
 %.o: %.c ${HEADERS}
 	echo "CC $<"
 	$(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<
@@ -97,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:  install-bin install-wwwdata install-tinymce install-locale install-cfg
 
 install-bin:
 	test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
@@ -107,10 +117,9 @@ install-bin:
 		ln -s $(DESTDIR)$(prefix)/webcit $(DESTDIR)$(prefix)/webserver; \
 	fi
 
-
-install-setupbin: install-bin
-	$(INSTALL) setup $(DESTDIR)$(prefix)/setup
-
+install-cfg:
+	test -d $(DESTDIR)$(ETCDIR) || mkdir -p $(DESTDIR)$(ETCDIR)
+	$(INSTALL) nogz-mimetypes.txt $(DESTDIR)/$(ETCDIR)/nogz-mimetypes.txt
 
 install-wwwdata:
 	test -d $(DESTDIR)$(WWWDIR)/static.local/t || mkdir -p $(DESTDIR)$(WWWDIR)/static.local/t