* Room info popup now uses Scriptactulous appear and fade effects

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index a40e3fd3981a9fd929dfe4d74c749e704985e285..855be3b85f2246dc2301384dc6cae122cd2bb2d5 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -14,11 +14,13 @@ 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: all-progs-recursive webserver setup
@@ -50,6 +52,7 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
        groupdav_main.o groupdav_get.o groupdav_propfind.o fmt_date.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 \
        $(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 \
@@ -61,14 +64,20 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
        groupdav_main.o groupdav_get.o groupdav_propfind.o groupdav_delete.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 \
+       gettext.o downloads.o addressbook_popup.o \
        $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
+               -DWEBCITDIR=\"$(WWWDIR)\" \
+               -DLOCALEDIR=\"$(LOCALEDIR)\" \
+               -DEDITORDIR=\"$(EDITORDIR)\" $<
 
 .cpp.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
+       $(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
@@ -82,25 +91,43 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
-install:
-       test -d $(DESTDIR)$(prefix) || mkdir $(DESTDIR)$(prefix)
-       test -d $(DESTDIR)$(prefix)/static || mkdir $(DESTDIR)$(prefix)/static
-       for i in `find tiny_mce -type d | grep -v .svn` \
-               ; do \
-               test -d $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(prefix)/$$i; \
+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
-       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 $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(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 $(DESTDIR)$(prefix)/$$i; \
+               $(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 \