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

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index e5754cd681b9478aeb4f1c91dc6c1e937ca4d1bb..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,7 +42,9 @@ 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 \
@@ -80,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  \
+       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 \
@@ -91,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)
 
@@ -151,6 +153,9 @@ 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)
 
+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 \
         $(LIBOBJS) $(LDFLAGS) -o sendcommand $(LIBS)
@@ -173,6 +178,12 @@ install: install-exec install-data install-doc
        @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 \
                 network/systems; do \
@@ -212,7 +223,7 @@ install-exec: all
                        $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
-       @for i in utilsmenu ; 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; \