* Replaced all "Citadel/UX" references with "Citadel"

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 513a28c252bbbd9dba51d0cc422031c40d4bed64..907288b7eb8295fd649b50c3d085f773bc516dbb 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile for Citadel/UX
+# Makefile for Citadel
 #
 # NOTE: normally you should not have to modify the Makefile.  All
 # system-dependent configuration is in the "configure" script, which
@@ -21,7 +21,7 @@ all: $(TARGETS)
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
+CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
 SERVER_TARGETS=citserver setup $(CHKPWD)
 SERV_MODULES=serv_chat.o \
        serv_upgrade.o \
@@ -42,32 +42,37 @@ SERV_MODULES=serv_chat.o \
        serv_bio.o \
        serv_expire.o \
        serv_vandelay.o \
-       serv_calendar.o ical_dezonify.o
+       serv_calendar.o \
+       ical_dezonify.o \
+       serv_ldap.o
 
 UTIL_TARGETS=aidepost msgform \
        citmail userlist sendcommand \
-       base64 migratenet$(EXEEXT)
+       base64
 
 prefix=@prefix@
 srcdir=@srcdir@
 
+ACLOCAL=@ACLOCAL@
 AUTH=@AUTH@
-DEFS=@DEFS@
-CPPFLAGS=@CPPFLAGS@ -I.
-CFLAGS=@CFLAGS@
+AUTOCONF=@AUTOCONF@
+chkpwd_LIBS=@chkpwd_LIBS@
 CC=@CC@
-RESOLV=@RESOLV@
-LIBS=@LIBS@
+CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@ -I.
+DATABASE=@DATABASE@
+DEFS=@DEFS@
 LDFLAGS=@LDFLAGS@
-chkpwd_LIBS=@chkpwd_LIBS@
+LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
+RESOLV=@RESOLV@
 SHELL=/bin/sh
-AUTOCONF=@AUTOCONF@
-ACLOCAL=@ACLOCAL@
+SERVER_LDFLAGS=@SERVER_LDFLAGS@
+SERVER_LIBS=@SERVER_LIBS@
+SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
-DATABASE=@DATABASE@
 
 # End configuration section
 
@@ -77,9 +82,9 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
        citmail.c citserver.c client_chat.c client_passwords.c \
        clientsocket.c commands.c config.c control.c $(DATABASE) \
        domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \
-       housekeeping.c html.c imap_fetch.c imap_misc.c imap_search.c \
-       imap_store.c imap_tools.c internet_addressing.c ipc_c_tcp.c \
-       locate_host.c md5.c messages.c migratenet.c \
+       housekeeping.c html.c ical_dezonify.c imap_fetch.c imap_misc.c \
+       imap_search.c imap_store.c imap_tools.c internet_addressing.c \
+       ipc_c_tcp.c locate_host.c md5.c messages.c  \
        mime_parser.c msgbase.c msgform.c parsedate.c policy.c \
        room_ops.c rooms.c routines.c routines2.c \
        screen.c sendcommand.c serv_bio.c serv_calendar.c serv_chat.c \
@@ -88,8 +93,8 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
        serv_newuser.c serv_pas2.c serv_pop3.c serv_rwho.c serv_smtp.c \
        serv_spam.c serv_test.c serv_mrtg.c serv_spam.c serv_upgrade.c \
        serv_vandelay.c serv_vcard.c server_main.c setup.c snprintf.c \
-       support.c sysdep.c tools.c user_ops.c userlist.c \
-       whobbs.c vcard.c ical_dezonify.c
+       stress.c support.c sysdep.c tools.c user_ops.c userlist.c \
+       whobbs.c vcard.c
 
 DEP_FILES=$(SOURCES:.c=.d)
 
@@ -127,7 +132,7 @@ SERV_OBJS = server_main.o \
        clientsocket.o $(AUTH) $(SERV_MODULES)
 
 citserver: $(SERV_OBJS)
-       $(CC) $(SERV_OBJS) $(LDFLAGS) $(LIBS) $(RESOLV) -o citserver
+       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver
 
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
@@ -138,8 +143,9 @@ aidepost: aidepost.o config.o
 citmail: citmail.o config.o
        $(CC) citmail.o config.o $(LDFLAGS) -o citmail $(LIBS)
 
+# setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
 setup: setup.o tools.o
-       $(CC) setup.o tools.o $(LIBS) $(LDFLAGS) -o setup
+       $(CC) setup.o tools.o $(LDFLAGS) -o setup $(LIBS) $(SETUP_LIBS)
 
 chkpwd: chkpwd.o auth.o config.o
        $(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
@@ -147,8 +153,8 @@ chkpwd: chkpwd.o auth.o config.o
 whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o citadel_ipc.o $(LIBOBJS)
        $(CC) whobbs.o ipc_c_tcp.o tools.o citadel_ipc.o  $(LIBOBJS) $(LDFLAGS) -o whobbs $(LIBS)
 
-migratenet$(EXEEXT): migratenet.o config.o ipc_c_tcp.o citadel_ipc.o tools.o $(LIBOBJS)
-       $(CC) migratenet.o config.o ipc_c_tcp.o citadel_ipc.o tools.o $(LIBOBJS) $(LDFLAGS) -o migratenet $(LIBS)
+stress$(EXEEXT): stress.o ipc_c_tcp.o tools.o citadel_ipc.o $(LIBOBJS)
+       $(CC) stress.o ipc_c_tcp.o tools.o citadel_ipc.o $(LIBOBJS) $(LDFLAGS) -o stress $(LIBS)
 
 sendcommand: sendcommand.o ipc_c_tcp.o citadel_ipc.o tools.o config.o $(LIBOBJS)
        $(CC) sendcommand.o ipc_c_tcp.o citadel_ipc.o tools.o config.o \
@@ -167,6 +173,16 @@ msgform: msgform.o
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
 install: install-exec install-data install-doc
+       @echo 
+       @echo Installation is complete.
+       @echo Now go to your Citadel directory and run 'setup'.
+       @echo 
+
+upgrade: install-exec install-doc
+       @echo
+       @echo Upgrade is complete.
+       @echo Now go to your Citadel directory and run 'setup'.
+       @echo
 
 install-data:
        @for i in help messages network/spoolin network/spoolout \
@@ -184,13 +200,20 @@ install-data:
        fi
 
 install-doc:
+       @$(srcdir)/mkinstalldirs $(root)$(prefix)/docs
+       @for i in `find $(srcdir)/docs -type f | grep -v CVS`; do \
+               echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
+               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
+       done
        @$(srcdir)/mkinstalldirs $(root)$(prefix)/techdoc
        @for i in `find $(srcdir)/techdoc -type f | grep -v CVS`; do \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
+       echo $(INSTALL_DATA) README.txt $(root)$(prefix)/README.txt
+       $(INSTALL_DATA) README.txt $(root)$(prefix)/README.txt
 
-install-exec: all weekly
+install-exec: all
        @for i in bio bitbucket files images info userpics; do \
                $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
        done
@@ -200,7 +223,7 @@ install-exec: all weekly
                        $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
-       @for i in utilsmenu weekly ; do \
+       @for i in utilsmenu database_cleanup.sh ; do \
                if test -f $(srcdir)/$$i; then \
                        echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
                        $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
@@ -219,7 +242,7 @@ cleaner: clean
 
 distclean: cleaner
        find . -name '*~' -o -name '.#*' | xargs rm -f
-       rm -f Makefile sysdep.h config.cache config/.og config.status *.d weekly
+       rm -f Makefile sysdep.h config.cache config/.og config.status *.d 
 
 .c.d:
        @echo Checking dependencies for $<
@@ -238,7 +261,4 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
-weekly: $(srcdir)/weekly.in config.status
-       CONFIG_FILES=weekly CONFIG_HEADERS= $(SHELL) ./config.status
-
 -include $(DEP_FILES)