* GNU LD demands -l at the end... hopefully just adding them twice solves this

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 06b66da5abb7e1db3b8ddde466464eb0de070f41..5042d4f563f2658c7fc3d33ca8b767477557ff8b 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -19,17 +19,16 @@ 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
+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
@@ -37,47 +36,43 @@ 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
+       $(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) $(SETUP_LIBS) 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 \
+       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 sieve.o \
        groupdav_delete.o groupdav_put.o http_datestring.o setup_wizard.o \
-       downloads.o  addressbook_popup.o \
+       downloads.o addressbook_popup.o pushemail.o sysdep.o openid.o \
+       modules_init.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 \
+       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 smtpqueue.o sieve.o \
-       groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o \
-       gettext.o downloads.o addressbook_popup.o \
-       $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
+       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 \
+       -o webcit \
+       $(LIBS)
 
 .c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
-               -DWEBCITDIR=\"$(WWWDIR)\" \
-               -DLOCALEDIR=\"$(LOCALEDIR)\" \
-               -DEDITORDIR=\"$(EDITORDIR)\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 .cpp.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
-               -DWEBCITDIR=\"$(WWWDIR)\" \
-               -DLOCALEDIR=\"$(LOCALEDIR)\"  \
-               -DEDITORDIR=\"$(EDITORDIR)\"$<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -95,7 +90,11 @@ install:  install-bin install-setupbin install-wwwdata install-tinymce install-l
 
 install-bin:
        test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
-       $(INSTALL) webserver $(DESTDIR)$(prefix)/webserver
+       $(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
@@ -122,6 +121,7 @@ install-tinymce:
        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; \