X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=d75761da0b757754a0c121b099789c5da664f9bd;hb=7699e371d7119cd7238f14b82200254f9d607f28;hp=fc8032c13cf00148189854f10482abd7f185e8bc;hpb=26a4a07bdacdaa7013bf45cc235df207708acfde;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index fc8032c13..d75761da0 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -14,20 +14,21 @@ 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@
 
 # End of configuration section
 
-all: all-progs-recursive webserver setup
+all: all-progs-recursive webcit setup
 
 
 .SUFFIXES: .cpp .c .o
 
 clean:
-	rm -f *.o webcit webserver
+	rm -f *.o webcit webcit setup
 	rm -fr locale/*
 
 distclean: clean
@@ -35,69 +36,100 @@ distclean: clean
 		po/Makefile \
 		$(srcdir)/TAGS
 
-setup: setup.o tools.o
-	$(CC) setup.o tools.o \
-	$(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
+setup: setup.o gettext.o
+	$(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) $(SETUP_LIBS) \
+	gettext.o setup.o -o setup
 
-webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
+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 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 \
+	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 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 autocompletion.o gettext.o tabs.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 addressbook_popup.o pushemail.o sysdep.o openid.o \
+	decode.o modules_init.o paramhandling.o utils.o \
 	$(LIBOBJS)
-	$(CC) webserver.o context_loop.o tools.o cookie_conversion.o \
+	$(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) \
+	webserver.o context_loop.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 rss.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 rss.o openid.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 tabs.o \
-	groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o \
-	gettext.o \
-	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
+	groupdav_options.o autocompletion.o tabs.o smtpqueue.o sieve.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 \
+	-o webcit \
+	$(LIBS)
 
 .c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 .cpp.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\"  $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 Makefile: $(srcdir)/Makefile.in config.status
-	CONFIG_FILES="Makefile" CONFIG_HEADERS= $(SHELL) ./config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
 
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: $(srcdir)/configure.in
+$(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 `find tiny_mce -type d | grep -v .svn` \
-		; do \
-		test -d $(root)$(prefix)/$$i || mkdir $(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) webcit $(DESTDIR)$(prefix)/webcit
+	if test -f $(DESTDIR)$(prefix)/webserver; then \
+		rm -f $(DESTDIR)$(prefix)/webserver; \
+		ln -s $(DESTDIR)$(prefix)/webcit $(DESTDIR)$(prefix)/webserver; \
+	fi
+
+
+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
+	for i in `find static -type f | grep -v .svn`; do \
+		$(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
 	done
-	for i in `find locale -type d | grep -v .svn` \
+
+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 $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
+		test -d $(DESTDIR)$(WWWDIR)/$$i || mkdir -p $(DESTDIR)$(WWWDIR)/$$i; \
 	done
 	for i in \
-		webserver \
-		setup \
-		`find static -type f | grep -v .svn` \
 		`find tiny_mce -type f | grep -v .svn` \
-		`find locale -type f | grep -v .svn` \
 		; do \
-		$(INSTALL) $$i $(root)$(prefix)/$$i; \
+		$(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
+	done
+
+install-locale:
+	cd po; make
+	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 \
@@ -110,24 +142,24 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
 	  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-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
+#	@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