X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=abb8efbb620d2c68ef381487593e16f4bbb5a76d;hb=7465c5bdbaeb6548db295ef8b5b8ffdd160f4edb;hp=517e946343e58c39d3356e0920fbfb5072884340;hpb=dafc7152feffcb1ae90f951bba71c4d82ab037e4;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 517e94634..abb8efbb6 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -4,70 +4,73 @@ AUTOCONF=@AUTOCONF@
 CC=@CC@
 CFLAGS=@CFLAGS@
 DEFS=@DEFS@
+INSTALL=@INSTALL@
 LIBOBJS=@LIBOBJS@
 LIBS=@LIBS@
+LDFLAGS=@LDFLAGS@
+SED=@SED@
+SETUP_LIBS=@SETUP_LIBS@
+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: webserver webcit
+all: all-progs-recursive webserver setup
 
 
+.SUFFIXES: .cpp .c .o
+
 clean:
-	rm -f *.o webcit webserver
+	rm -f *.o webcit webserver setup
+	rm -fr locale/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status
-
-
-webserver: webserver.o context_loop.o $(LIBOBJS)
-	$(CC) webserver.o context_loop.o $(LIBOBJS) $(LIBS) -o webserver
-
-webserver.o: webserver.c webcit.h
-	$(CC) $(CFLAGS) $(DEFS) -c -D_REENTRANT webserver.c
-
-context_loop.o: context_loop.c webcit.h webserver.h
-	$(CC) $(CFLAGS) $(DEFS) -c -D_REENTRANT context_loop.c
-
-snprintf.o: snprintf.c
-	$(CC) $(CFLAGS) $(DEFS) -c -D_REENTRANT snprintf.c
-
-
-
-webcit: webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
-	roomops.o tools.o messages.o userlist.o
-	$(CC) webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
-	tools.o roomops.o messages.o userlist.o -o webcit
-
-webcit.o: webcit.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c webcit.c
-
-auth.o: auth.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c auth.c
-
-tcp_sockets.o: tcp_sockets.c webcit.h
-	$(CC) $(CFLAGS) $(DEFS) -c tcp_sockets.c
-
-mainmenu.o: mainmenu.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c mainmenu.c
-
-serv_func.o: serv_func.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c serv_func.c
-
-who.o: who.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c who.c
-
-userlist.o: userlist.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c userlist.c
-
-tools.o: tools.c webcit.h
-	$(CC) $(CFLAGS) $(DEFS) -c tools.c
-
-roomops.o: roomops.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c roomops.c
-
-messages.o: messages.c webcit.h child.h
-	$(CC) $(CFLAGS) $(DEFS) -c messages.c
+	rm -f Makefile config.cache config.log config.status \
+		po/Makefile \
+		$(srcdir)/TAGS
+
+setup: setup.o
+	$(CC) setup.o \
+	$(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
+
+webserver: 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_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 pushemail.o sysdep.o html.o\
+	$(LIBOBJS)
+	$(CC) 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_edit.o floors.o \
+	graphics.o netconf.o preferences.o html2html.o rss.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 pushemail.o sysdep.o html.o \
+	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
+
+.c.o:
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
+
+.cpp.o:
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -75,5 +78,80 @@ Makefile: $(srcdir)/Makefile.in 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:  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
+
+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 tiny_mce -type f | grep -v .svn` \
+		; do \
+		$(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 \
+  mostlyclean-recursive realclean-recursive:
+	@for subdir in $(SUBDIRS); do \
+	  if test -d $$subdir ; then \
+	    target=`echo $@|$(SED) 's/-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
+