Now the server records the SVN revision in the log at startup.

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 9c8445176336d60b7e012e8b7498b30da9288ac4..8639ae6e38390c77e392f1a566eaa20ab9cf9f94 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -52,14 +52,14 @@ CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
 DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@
+LDFLAGS=@LDFLAGS@  -Wl,--no-undefined
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
-SERVER_LDFLAGS=@SERVER_LDFLAGS@
+SERVER_LDFLAGS=@SERVER_LDFLAGS@  -Wl,--no-undefined 
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
@@ -72,7 +72,7 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.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 ical_dezonify.c \
+       housekeeping.c ical_dezonify.c \
        internet_addressing.c ecrash.c \
        ipc_c_tcp.c locate_host.c md5.c messages.c  \
        msgbase.c msgform.c parsedate.c policy.c \
@@ -82,11 +82,15 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
        setup.c snprintf.c \
        stress.c support.c sysdep.c user_ops.c userlist.c \
        whobbs.c \
-       crc16.c journaling.c citadel_dirs.c
+       crc16.c journaling.c citadel_dirs.c threads.c
+
 
 include Make_sources
 
-DEP_FILES=$(SOURCES:.c=.d) modules_init.d
+svn_revision.c: ${SOURCES}
+       ./mk_svn_revision.sh
+
+DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
 client: $(CLIENT_TARGETS)
 
@@ -95,10 +99,10 @@ server: $(SERVER_TARGETS) $(SERV_MODULES)
 utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 
 citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \
-       commands.o html.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
+       commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
        routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS)
        $(CC) citadel.o citadel_ipc.o client_chat.o client_passwords.o \
-       commands.o html.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
+       commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
        routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) \
        $(LDFLAGS) -o citadel $(LIBS)
 
@@ -115,18 +119,18 @@ Make_sources: modules_init.c
 
 Make_modules: modules_init.c
 
-modules_init.c: mk_module_init.sh $(SOURCES) 
-       $(srcdir)/mk_module_init.sh
+modules_upgrade.c: modules_init.c
 
 SERV_OBJS = server_main.o \
        user_ops.o citserver.o sysdep.o serv_extensions.o \
        $(DATABASE:.c=.o) domain.o \
        control.o policy.o config.o support.o room_ops.o \
        file_ops.o msgbase.o euidindex.o \
-       locate_host.o housekeeping.o html.o \
+       locate_host.o housekeeping.o \
        internet_addressing.o journaling.o \
-       parsedate.o genstamp.o ecrash.o \
-       clientsocket.o modules_init.o $(AUTH) $(SERV_MODULES)
+       parsedate.o genstamp.o ecrash.o threads.o\
+       clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
+       svn_revision.o
 
 citserver: $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver
@@ -247,6 +251,10 @@ install-doc:
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
        done
+       @for i in `cd openldap; find $(srcdir)/ -type f | grep -v .svn`; do \
+               echo $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(prefix)/$$i; \
+               $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(prefix)/$$i; \
+       done
        echo $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt
        $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt
 
@@ -261,6 +269,10 @@ install-doc-new:
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \
        done
+       @for i in `cd openldap; find $(srcdir)/ -type f | grep -v .svn`; do \
+               echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \
+               $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
+       done
        $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
@@ -276,7 +288,7 @@ install-exec: all
        $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/unstripped
        cp $(SERVER_TARGETS) $(DESTDIR)$(prefix)/unstripped/
 
-       @for i in utilsmenu database_cleanup.sh citadel-openldap.schema; do \
+       @for i in utilsmenu database_cleanup.sh migrate_aliases.sh citadel-openldap.schema; do \
                if test -f $(srcdir)/$$i; then \
                        echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
                        $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
@@ -296,6 +308,7 @@ install-exec-new: all
                fi \
        done
        cp citserver $(DESTDIR)/$(UTILBIN_DIR)/citserver.unstripped
+       cp migrate_aliases.sh $(DESTDIR)/$(UTILBIN_DIR)/
        @for i in $(UTILBIN_TARGETS); do \
                if test -f $$i; then \
                        echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \
@@ -327,7 +340,7 @@ clean:
 
 cleaner: clean
        rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) database_cleanup.sh *.la
-       rm -rf modules_init.c modules_init.h Make_modules Make_sources
+       rm -rf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
 
 distclean: cleaner
        find . -name '*~' -o -name '.#*' | xargs rm -f