* First cut at Solaris fixes. There may still be some *printf("%s", NULL)

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 9f8d3537c5ae689d0f69d22c21e921dbb4ed9e25..60ce949830eb5567a0f054f48719fc6e810d97d8 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -21,6 +21,7 @@ all: $(TARGETS)
 
 EXEEXT=@EXEEXT@
 SO=@SO@
+CX=@CX@
 SERV_ICQ=@SERV_ICQ@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
@@ -28,6 +29,9 @@ SERVER_TARGETS=citserver setup $(CHKPWD)
 SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
        modules/serv_upgrade$(SO) \
        modules/serv_smtp$(SO) modules/serv_pop3$(SO) \
+       modules/serv_inetcfg$(SO) \
+       modules/serv_rwho$(SO) \
+       modules/serv_bio$(SO) \
        modules/serv_expire$(SO) $(SERV_ICQ)
 UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
        stats citmail netpoll mailinglist userlist sendcommand \
@@ -43,6 +47,7 @@ CPPFLAGS=@CPPFLAGS@ -I.
 CFLAGS=@CFLAGS@
 CC=@CC@
 GDBM=@GDBM@
+RESOLV=@RESOLV@
 LINK_SHARED=@LINK_SHARED@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
@@ -52,7 +57,10 @@ CURSES=@CURSES@
 NETLIBS=@NETLIBS@
 chkpwd_LIBS=@chkpwd_LIBS@
 LIBOBJS=@LIBOBJS@
+CL_LIBOBJS=@CL_LIBOBJS@
 PTHREAD_DEFS=@PTHREAD_DEFS@
+PTHREAD_LIBS=@PTHREAD_LIBS@
+CLIENT_PTLIBS=@CLIENT_PTLIBS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 SHELL=/bin/sh
@@ -63,7 +71,7 @@ AUTOCONF=@AUTOCONF@
 VPATH=$(srcdir)
 
 SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
-       config.c control.c cux2ascii.c database.c dynloader.c file_ops.c \
+       config.c control.c database.c dynloader.c file_ops.c \
        housekeeping.c internetmail.c ipc_c_tcp.c locate_host.c \
        logging.c mailinglist.c messages.c msgbase.c msgform.c netmailer.c \
        netpoll.c netproc.c netsetup.c policy.c proxy.c rcit.c readlog.c \
@@ -73,7 +81,7 @@ SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
        whobbs.c sendcommand.c mime_parser.c base64.c qpdecode.c getutline.c \
        auth.c chkpwd.c client_icq.c html.c vcard.c serv_upgrade.c \
        serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
-       domain.c
+       domain.c clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c
 
 DEP_FILES=$(SOURCES:.c=.d)
 
@@ -88,13 +96,13 @@ serv_modules: $(SERV_MODULES)
 #
 #
 
-citadel$(EXEEXT): ipc_c_tcp.o citadel.o rooms.o routines.o \
-       routines2.o messages.o client_icq.o \
-       commands.o client_chat.o serv_info.o tools.o $(LIBOBJS)
-       $(CC) ipc_c_tcp.o citadel.o rooms.o routines.o routines2.o \
-       messages.o client_icq.o \
-       commands.o client_chat.o serv_info.o tools.o $(LIBOBJS) $(LDFLAGS) \
-       -o citadel $(NETLIBS)
+citadel$(EXEEXT): ipc_c_tcp$(CX) citadel$(CX) rooms$(CX) routines$(CX) \
+       routines2$(CX) messages$(CX) client_icq$(CX) \
+       commands$(CX) client_chat$(CX) serv_info$(CX) tools$(CX) $(LIBOBJS)
+       $(CC) ipc_c_tcp$(CX) citadel$(CX) rooms$(CX) routines$(CX) \
+       routines2$(CX) messages$(CX) client_icq$(CX) \
+       commands$(CX) client_chat$(CX) serv_info$(CX) tools$(CX) \
+       $(LIBOBJS) $(LDFLAGS) -o citadel $(NETLIBS) $(CLIENT_PTLIBS)
 
 netpoll: netpoll.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) netpoll.o config.o ipc_c_tcp.o tools.o \
@@ -110,11 +118,12 @@ SERV_OBJS = citserver.ro user_ops.ro support.ro room_ops.ro file_ops.ro \
        msgbase.ro config.ro sysdep.ro locate_host.ro housekeeping.ro \
        database.ro control.ro logging.ro policy.ro dynloader.ro tools.ro \
        mime_parser.ro html.ro internet_addressing.ro \
-       parsedate.ro genstamp.ro \
+       parsedate.ro genstamp.ro clientsocket.ro \
        $(AUTH) $(LIBOBJS:.o=.ro)
 
 citserver: $(SERV_OBJS)
-       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(NETLIBS) $(GDBM) -o citserver
+       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(PTHREAD_LIBS) \
+       $(LIBS) $(NETLIBS) $(GDBM) $(RESOLV) -o citserver
 
 .c.ro:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
@@ -140,6 +149,24 @@ modules/serv_pop3.so: serv_pop3.mo
 modules/serv_pop3.mo: serv_pop3.mo
        ln -f serv_pop3.mo modules
 
+modules/serv_inetcfg.so: serv_inetcfg.mo
+       $(LINK_SHARED) -o modules/serv_inetcfg.so serv_inetcfg.mo
+
+modules/serv_inetcfg.mo: serv_inetcfg.mo
+       ln -f serv_inetcfg.mo modules
+
+modules/serv_rwho.so: serv_rwho.mo
+       $(LINK_SHARED) -o modules/serv_rwho.so serv_rwho.mo
+
+modules/serv_rwho.mo: serv_rwho.mo
+       ln -f serv_rwho.mo modules
+
+modules/serv_bio.so: serv_bio.mo
+       $(LINK_SHARED) -o modules/serv_bio.so serv_bio.mo
+
+modules/serv_bio.mo: serv_bio.mo
+       ln -f serv_bio.mo modules
+
 modules/serv_expire.so: serv_expire.mo
        $(LINK_SHARED) -o modules/serv_expire.so serv_expire.mo
 
@@ -192,13 +219,8 @@ netproc: netproc.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) netproc.o config.o ipc_c_tcp.o tools.o \
        $(LIBOBJS) $(LDFLAGS) -o netproc $(NETLIBS) $(GDBM)
 
-citmail: citmail.o
-       @echo "*"
-       @echo "*                 ###### IMPORTANT ######"
-       @echo "* To allow Citadel users to receive Internet mail, you must"
-       @echo "* set this program to be your local mail delivery agent."
-       @echo "*"
-       $(CC) citmail.o $(LDFLAGS) -o citmail
+citmail: citmail.o config.o
+       $(CC) citmail.o config.o $(LDFLAGS) -o citmail $(NETLIBS)
 
 mailinglist: mailinglist.o config.o internetmail.o
        $(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist
@@ -240,11 +262,6 @@ readlog: readlog.o config.o
 
 rcit: rcit.o config.o
        $(CC) rcit.o config.o $(LDFLAGS) -o rcit
-       @echo "*"
-       @echo "* NOTE: TO RECEIVE CITADEL TRAFFIC VIA THE RCIT PROGRAM (ESPECIALLY"
-       @echo "* IF YOU ARE GATEWAYING TO USENET) YOU MUST LINK RNEWS TO RCIT:"
-       @echo "* ln -s rcit /usr/bin/rnews"
-       @echo "*"
 
 stats: stats.o ipc_c_tcp.o tools.o config.o $(LIBOBJS)
        $(CC) stats.o ipc_c_tcp.o tools.o config.o $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS)
@@ -270,7 +287,7 @@ install-data:
 
 install-doc:
        @./mkinstalldirs $(root)$(prefix)/techdoc
-       @for i in *.txt `find techdoc -type f | grep -v CVS`; do \
+       @for i in `find techdoc -type f | grep -v CVS`; do \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done