Added pager config to tuiconfig.c

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 732301c96e946995a5a91a4e646a05b12f5f741a..559583afd9fb6c8b3f5b47f4e987a4891e8b3adf 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -19,6 +19,7 @@ PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 LOCALEDIR=@LOCALEDIR@
 WWWDIR=@WWWDIR@
+
 # End of configuration section
 
 all: all-progs-recursive webserver setup
@@ -50,6 +51,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 pushemail.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 +63,14 @@ 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 pushemail.o \
        $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(WWWDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 .cpp.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(WWWDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -82,29 +84,37 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
-install:  install-bin install-locale install-wwwdata
+install:  install-bin install-setupbin install-wwwdata install-tinymce install-locale
 
 install-bin:
-       test -d $(DESTDIR)$(prefix) || mkdir $(DESTDIR)$(prefix)
-       for i in webserver setup; do \
-               $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
-       done
+       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)$(prefix)/static || mkdir -p $(DESTDIR)$(prefix)/static
+       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 static -type f | grep -v .svn` \
                `find tiny_mce -type f | grep -v .svn` \
                ; do \
                $(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
        done
 
 install-locale:
-       test -d $(DESTDIR)$(prefix)/local || mkdir -p $(DESTDIR)$(prefix)/local
        for i in `find locale -type d | grep -v .svn` \
                ; do \
                test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \
@@ -123,24 +133,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