* remove stress binary from the install target, since its just a developer tool.

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 75e4a76b59ea80c31d86ded1850db5373b238031..052b0a903c1029aa39a38cf7dcd68b4d65770e55 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -27,7 +27,8 @@ all: $(TARGETS)
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
+CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
+NOINST_TARGETS=stress$(EXEEXT)
 SERVER_TARGETS=citserver
 SERV_MODULES=crc16.o \
        md5.o \
@@ -52,14 +53,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 +73,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,12 +83,17 @@ 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
 
+svn_revision.c: ${SOURCES}
+       ./mk_svn_revision.sh
+
 DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
+noinst: $(NOINST_TARGETS)
 client: $(CLIENT_TARGETS)
 
 server: $(SERVER_TARGETS) $(SERV_MODULES)
@@ -95,10 +101,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)
 
@@ -117,18 +123,16 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-modules_init.c: mk_module_init.sh $(SOURCES) 
-       $(srcdir)/mk_module_init.sh
-
 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 modules_upgrade.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
@@ -249,6 +253,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
 
@@ -263,6 +271,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
@@ -325,11 +337,11 @@ clean:
        for i in $(srcdir)/modules/* ; do \
                rm -f $$i/*.o ;\
        done
-       rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS)
+       rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
 
 cleaner: clean
-       rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) database_cleanup.sh *.la
+       rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
        rm -rf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
 
 distclean: cleaner