X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=96f11f3cd0c2e3e65467e0f7f13c31980af6f45d;hb=a98b77122767a5ab63763b37715f2b8a5403de34;hp=315824fee4fc0ef1ea4b4161538cb1bfedb9c199;hpb=2471e0158cc7784dadf70167df9be7ca457d0481;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 315824fee..96f11f3cd 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -8,22 +8,34 @@ INSTALL=@INSTALL@
 LIBOBJS=@LIBOBJS@
 LIBS=@LIBS@
 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) 
+LOCALEDIR=@LOCALEDIR@
+WWWDIR=@WWWDIR@
+EDITORDIR=@EDITORDIR@
 
 # End of configuration section
 
-all: webserver setup
+all: all-progs-recursive webserver setup
 
-.SUFFIXES: .c .o
+
+.SUFFIXES: .cpp .c .o
 
 clean:
 	rm -f *.o webcit webserver
+	rm -fr locale/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status
+	rm -f Makefile config.cache config.log config.status \
+		po/Makefile \
+		$(srcdir)/TAGS
 
 setup: setup.o tools.o
 	$(CC) setup.o tools.o \
@@ -34,27 +46,38 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.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 \
-	calendar.o calendar_tools.o calendar_view.o event.o \
-	availability.o iconbar.o crypto.o inetconf.o notes.o \
+	mime_parser.o graphics.o netconf.o siteconfig.o subst.o rss.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 \
+	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  \
 	$(LIBOBJS)
 	$(CC) webserver.o context_loop.o tools.o cookie_conversion.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.o vcard_edit.o floors.o \
-	mime_parser.o graphics.o netconf.o preferences.o html2html.o \
-	summary.o calendar.o calendar_tools.o calendar_view.o event.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 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 \
+	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 \
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
+		-DWEBCITDIR=\"$(WWWDIR)\" \
+		-DLOCALEDIR=\"$(LOCALEDIR)\" \
+		-DEDITORDIR=\"$(EDITORDIR)\" $<
+
+.cpp.o:
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
+		-DWEBCITDIR=\"$(WWWDIR)\" \
+		-DLOCALEDIR=\"$(LOCALEDIR)\"  \
+		-DEDITORDIR=\"$(EDITORDIR)\"$<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -62,12 +85,79 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
+$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 	cd $(srcdir) && $(AUTOCONF)
 
-install:
-	test -d $(root)$(prefix) || mkdir $(root)$(prefix)
-	test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static
-	for i in webserver setup `find static -type f | grep -v CVS` ; do \
-		$(INSTALL) $$i $(root)$(prefix)/$$i; \
+$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
+	cd $(srcdir) && $(ACLOCAL)
+
+install:  install-bin install-setupbin install-wwwdata install-tinymce install-locale
+
+install-bin:
+	test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
+	$(INSTALL) webserver $(DESTDIR)$(prefix)/webserver
+
+
+install-setupbin: install-bin
+	$(INSTALL) setup $(DESTDIR)$(prefix)/setup
+
+
+install-wwwdata:
+	test -d $(DESTDIR)$(WWWDIR)/static.local || mkdir -p $(DESTDIR)$(WWWDIR)/static.local
+	test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static
+	for i in `find static -type f | grep -v .svn`; do \
+		$(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
+	done
+
+install-tinymce:
+	test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static
+	for i in `find tiny_mce -type d | grep -v .svn` \
+		; do \
+		test -d $(DESTDIR)$(WWWDIR)/$$i || mkdir -p $(DESTDIR)$(WWWDIR)/$$i; \
+	done
+	for i in \
+		`find tiny_mce -type f | grep -v .svn` \
+		; do \
+		$(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
 	done
+
+install-locale:
+	for i in `find locale -type d | grep -v .svn` \
+		; do \
+		test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \
+	done
+	for i in `find locale -type f | grep -v .svn`; do \
+		$(INSTALL) $$i $(DESTDIR)$(LOCALEDIR)/$$i; \
+	done
+
+TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
+  mostlyclean-recursive realclean-recursive:
+	@for subdir in $(SUBDIRS); do \
+	  if test -d $$subdir ; then \
+	    target=`echo $@|$(SED) 's/-recursive//'`; \
+	    echo making $$target in $$subdir; \
+	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
+	  fi ; \
+	done
+
+all-progs-recursive install-progs-recursive install-strip-progs-recursive \
+  uninstall-progs-recursive:
+	@for subdir in $(PROG_SUBDIRS); do \
+	  if test -d $$subdir ; then \
+	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
+	    echo making $$target in $$subdir; \
+	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
+	  fi ; \
+	done
+
+all-libs-recursive install-libs-recursive install-strip-libs-recursive \
+  uninstall-libs-recursive install-shlibs-libs-recursive \
+  install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
+	@for subdir in $(LIB_SUBDIRS); do \
+	  if test -d $$subdir ; then \
+	    target=`echo $@|$(SED) 's/-libs-recursive//'`; \
+	    echo making $$target in $$subdir; \
+	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
+	  fi ; \
+	done
+