* added a.n.o patches for solaris compatibility

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index bd104403b476dd062c2f069fc134a0a622b03886..51246189e9fe721b1ca5ec065aa7d589f88ffd3f 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -27,18 +27,20 @@ all: $(TARGETS)
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
-SERVER_TARGETS=citserver
+CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
+NOINST_TARGETS=stress$(EXEEXT)
+SERVER_TARGETS=citserver$(EXEEXT)
 SERV_MODULES=crc16.o \
        md5.o \
        ical_dezonify.o
 
 include Make_modules
 
-UTIL_TARGETS=aidepost msgform \
-       citmail userlist sendcommand getmail\
+UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
-UTILBIN_TARGETS= base64 setup chkpw chkpwd
+UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
+       chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \
+       getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT)
 
 prefix=@prefix@
 srcdir=@srcdir@
@@ -52,14 +54,14 @@ CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
 DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@  -Wl,--no-undefined -Wl,--as-needed
+LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
-SERVER_LDFLAGS=@SERVER_LDFLAGS@  -Wl,--no-undefined -Wl,--as-needed
+SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
@@ -84,10 +86,15 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
        whobbs.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)
@@ -125,53 +132,54 @@ SERV_OBJS = server_main.o \
        locate_host.o housekeeping.o \
        internet_addressing.o journaling.o \
        parsedate.o genstamp.o ecrash.o threads.o\
-       clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES)
+       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
+citserver$(EXEEXT): $(SERV_OBJS)
+       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
 
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-aidepost: aidepost.o config.o
-       $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost $(LIBS)
+aidepost$(EXEEXT): aidepost.o config.o
+       $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
 
-citmail: citmail.o citadel_dirs.o
-       $(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail $(LIBS)
+citmail$(EXEEXT): citmail.o citadel_dirs.o
+       $(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
 
 # setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
-setup: setup.o citadel_dirs.o
-       $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup $(LIBS) $(SETUP_LIBS)
+setup$(EXEEXT): setup.o citadel_dirs.o
+       $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
 
-chkpwd: chkpwd.o auth.o
-       $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
+chkpwd$(EXEEXT): chkpwd.o auth.o
+       $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
 
-chkpw: chkpw.o auth.o citadel_dirs.o
-       $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw $(chkpwd_LIBS)
+chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o
+       $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
 whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-       $(CC) whobbs.o ipc_c_tcp.o citadel_ipc.o  citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(LIBS)
+       $(CC) whobbs.o ipc_c_tcp.o citadel_ipc.o  citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS)
 
 stress$(EXEEXT): stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-       $(CC) stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress $(LIBS)
+       $(CC) stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress$(EXEEXT) $(LIBS)
 
-sendcommand: sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
+sendcommand$(EXEEXT): sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
        $(CC) sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  \
-        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand $(LIBS)
+        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
-getmail: getmail.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
+getmail$(EXEEXT): getmail.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
        $(CC) getmail.o ipc_c_tcp.o citadel_ipc.o config.o  \
-        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o getmail $(LIBS)
+        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS)
 
-base64: base64.o
-       $(CC) base64.o $(LDFLAGS) -o base64
+base64$(EXEEXT): base64.o
+       $(CC) base64.o $(LDFLAGS) -o base64$(EXEEXT)
 
-userlist: userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
+userlist$(EXEEXT): userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
        $(CC) userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o \
-       $(LIBOBJS) $(LDFLAGS) -o userlist $(LIBS)
+       $(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS)
 
-msgform: msgform.o
-       $(CC) msgform.o $(LDFLAGS) -o msgform
+msgform$(EXEEXT): msgform.o
+       $(CC) msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
@@ -330,11 +338,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