* Added "Base DN" "Bind DN" and "Bind DN password" config options

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index b04a12cba57e416f6d8696712117ec6e243f7812..27bd186406d5f0fef2149b6d044214470559bef2 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -42,11 +42,13 @@ 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@
@@ -68,6 +70,8 @@ INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
 SERVER_LDFLAGS=@SERVER_LDFLAGS@
+SERVER_LIBS=@SERVER_LIBS@
+SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
 
 # End configuration section
@@ -80,7 +84,7 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
        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 \
+       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 \
@@ -128,7 +132,7 @@ SERV_OBJS = server_main.o \
        clientsocket.o $(AUTH) $(SERV_MODULES)
 
 citserver: $(SERV_OBJS)
-       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_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 $@
@@ -139,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)
@@ -148,9 +153,6 @@ 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)
-
 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)
@@ -168,6 +170,10 @@ 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 
 
 install-data:
        @for i in help messages network/spoolin network/spoolout \
@@ -185,13 +191,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
@@ -201,7 +214,7 @@ install-exec: all weekly
                        $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
-       @for i in utilsmenu weekly ; do \
+       @for i in utilsmenu ; do \
                if test -f $(srcdir)/$$i; then \
                        echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
                        $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
@@ -220,7 +233,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 $<
@@ -239,7 +252,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)