* build the modules stuff while configuring. it's functional now, and once done is...

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 79d40df395fc6ea5604fd618e3277a1f4eb61997..0a2b3db0b0883fd7290781bbc471046c350567ab 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -29,8 +29,7 @@ EXEEXT=@EXEEXT@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
 SERVER_TARGETS=citserver
-SERV_MODULES=vcard.o \
-       crc16.o \
+SERV_MODULES=crc16.o \
        md5.o \
        ical_dezonify.o
 
@@ -53,14 +52,14 @@ CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
 DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@
+LDFLAGS=@LDFLAGS@  -Wl,--no-undefined -Wl,--as-needed
 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 -Wl,--as-needed
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
@@ -82,12 +81,12 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
        server_main.c \
        setup.c snprintf.c \
        stress.c support.c sysdep.c user_ops.c userlist.c \
-       whobbs.c vcard.c \
-       crc16.c journaling.c citadel_dirs.c
+       whobbs.c \
+       crc16.c journaling.c citadel_dirs.c threads.c
 
 include Make_sources
 
-DEP_FILES=$(SOURCES:.c=.d) modules_init.d
+DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
 client: $(CLIENT_TARGETS)
 
@@ -116,8 +115,7 @@ 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 \
@@ -126,8 +124,8 @@ SERV_OBJS = server_main.o \
        file_ops.o msgbase.o euidindex.o \
        locate_host.o housekeeping.o html.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)
 
 citserver: $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver
@@ -277,7 +275,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; \
@@ -297,6 +295,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; \
@@ -328,7 +327,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