Updated the autoconf script and makefile so that

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 600b46ce43f66412814a6b722b85e28e1ce92277..a40e3fd3981a9fd929dfe4d74c749e704985e285 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -8,6 +8,7 @@ INSTALL=@INSTALL@
 LIBOBJS=@LIBOBJS@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
+SED=@SED@
 SETUP_LIBS=@SETUP_LIBS@
 PTHREAD_DEFS=@PTHREAD_DEFS@
 srcdir=@srcdir@
@@ -15,21 +16,23 @@ prefix=@prefix@
 top_builddir=`pwd`
 
 LIB_SUBDIRS=
-PROG_SUBDIRS=po
+PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
-
+LOCALEDIR=@LOCALEDIR@
 # End of configuration section
 
 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
@@ -42,10 +45,10 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.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 \
+       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 \
@@ -53,39 +56,51 @@ 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
 
 .c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
+
+.cpp.o:
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
 
 Makefile: $(srcdir)/Makefile.in config.status
-       CONFIG_FILES="Makefile po/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)/aclocal.m4
+$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
        cd $(srcdir) && $(AUTOCONF)
 
+$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
+       cd $(srcdir) && $(ACLOCAL)
+
 install:
-       test -d $(root)$(prefix) || mkdir $(root)$(prefix)
-       test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static
+       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 $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
+               test -d $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(prefix)/$$i; \
+       done
+       for i in `find locale -type d | grep -v .svn` \
+               ; do \
+               test -d $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(prefix)/$$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)$(prefix)/$$i; \
        done
 
 TAGS clean-recursive distclean-recursive depend-recursive check-recursive \