X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=0512e25cea4a5facd8ca32c869e6251b1ac9739c;hb=25bdf679e0136c2cfdf0dbfd7b5ba23d95a2acbd;hp=66283dfe2192db4b9c70580f9d2061cfda11c56c;hpb=20a2e64d9f1dfbb5c9922d7aae188bec39fba3a3;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 66283dfe2..0512e25ce 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -16,38 +16,42 @@ prefix=@prefix@
 top_builddir=`pwd`
 
 LIB_SUBDIRS=
-PROG_SUBDIRS=po
+PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 
 # End of configuration section
 
-all: all-progs-recursive webserver setup
+all: all-progs-recursive webserver setup ctdlsvc
 
 
-.SUFFIXES: .c .o
+.SUFFIXES: .cpp .c .o
 
 clean:
-	rm -f *.o webcit webserver
+	rm -f *.o webcit webserver ctdlsvc
+	rm -fr locale/*
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
-		po/Makefile po/Makefile.in \
+		po/Makefile \
 		$(srcdir)/TAGS
 
 setup: setup.o tools.o
 	$(CC) setup.o tools.o \
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
 
+ctdlsvc: ctdlsvc.o
+	$(CC) ctdlsvc.o -o ctdlsvc
+
 webserver: webserver.o context_loop.o tools.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.o vcard_edit.o preferences.o html2html.o listsub.o \
 	mime_parser.o graphics.o netconf.o siteconfig.o subst.o rss.o \
-	calendar.o calendar_tools.o calendar_view.o event.o \
-	availability.o iconbar.o crypto.o inetconf.o notes.o \
+	calendar.o calendar_tools.o calendar_view.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\
+	groupdav_options.o autocompletion.o gettext.o tabs.o sieve.o \
 	groupdav_delete.o groupdav_put.o http_datestring.o setup_wizard.o \
 	$(LIBOBJS)
 	$(CC) webserver.o context_loop.o tools.o cookie_conversion.o \
@@ -55,10 +59,10 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \
 	locate_host.o siteconfig.o subst.o vcard.o vcard_edit.o floors.o \
 	mime_parser.o graphics.o netconf.o preferences.o html2html.o rss.o \
-	summary.o calendar.o calendar_tools.o calendar_view.o event.o \
+	summary.o calendar.o calendar_tools.o calendar_view.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 \
+	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 \
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
@@ -66,13 +70,16 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 .c.o:
 	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
 
+.cpp.o:
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\"  $<
+
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES="Makefile" CONFIG_HEADERS= $(SHELL) ./config.status
 
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
+$(srcdir)/configure: $(srcdir)/configure.in
 	cd $(srcdir) && $(AUTOCONF)
 
 install:
@@ -89,6 +96,7 @@ install:
 	for i in \
 		webserver \
 		setup \
+		ctdlsvc \
 		`find static -type f | grep -v .svn` \
 		`find tiny_mce -type f | grep -v .svn` \
 		`find locale -type f | grep -v .svn` \