* Finished the "arbitrary service" registration.

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 4427303d133991e32424a1264e93ed2b9050c636..e00c9d2aa03daedfdb8757034c1c450e891d08c6 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -19,13 +19,15 @@ all: $(TARGETS)
 
 .SUFFIXES: .ro .mo .d
 
-SUFFIX=@SUFFIX@
+EXEEXT=@EXEEXT@
 SO=@SO@
+SERV_ICQ=@SERV_ICQ@
 
-CLIENT_TARGETS=citadel$(SUFFIX) whobbs$(SUFFIX)
+CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
 SERVER_TARGETS=citserver setup $(CHKPWD)
-SERV_MODULES=modules/serv_chat$(SO) \
-       modules/serv_upgrade$(SO) modules/serv_expire$(SO)
+SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
+       modules/serv_upgrade$(SO) modules/serv_smtp$(SO) \
+       modules/serv_expire$(SO) $(SERV_ICQ)
 UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
        stats citmail netpoll mailinglist userlist sendcommand \
        base64 qpdecode
@@ -39,14 +41,17 @@ DEFS=@DEFS@
 CPPFLAGS=@CPPFLAGS@ -I.
 CFLAGS=@CFLAGS@
 CC=@CC@
+GDBM=@GDBM@
+LINK_SHARED=@LINK_SHARED@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
 SERVER_LDFLAGS=@SERVER_LDFLAGS@
 PICFLAGS=@PICFLAGS@
 CURSES=@CURSES@
+NETLIBS=@NETLIBS@
 chkpwd_LIBS=@chkpwd_LIBS@
 LIBOBJS=@LIBOBJS@
-PTHREAD_DEFS=-D_REENTRANT
+PTHREAD_DEFS=@PTHREAD_DEFS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 SHELL=/bin/sh
@@ -61,11 +66,12 @@ SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.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 \
-       room_ops.c rooms.c routines.c routines2.c serv_chat.c \
-       serv_info.c serv_test.c serv_upgrade.c setup.c snprintf.c stats.c \
+       room_ops.c rooms.c routines.c routines2.c serv_chat.c serv_icq.c \
+       serv_info.c serv_test.c setup.c snprintf.c stats.c serv_vcard.c \
        support.c sysdep.c tools.c user_ops.c userlist.c serv_expire.c \
        whobbs.c sendcommand.c mime_parser.c base64.c qpdecode.c getutline.c \
-       auth.c chkpwd.c
+       auth.c chkpwd.c client_icq.c html.c vcard.c serv_upgrade.c \
+       serv_smtp.c
 
 DEP_FILES=$(SOURCES:.c=.d)
 
@@ -80,15 +86,17 @@ serv_modules: $(SERV_MODULES)
 #
 #
 
-citadel$(SUFFIX): ipc_c_tcp.o citadel.o rooms.o routines.o routines2.o messages.o \
+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 \
+       $(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
+       -o citadel $(NETLIBS)
 
 netpoll: netpoll.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) netpoll.o config.o ipc_c_tcp.o tools.o \
-       $(LIBOBJS) $(LDFLAGS) -o netpoll
+       $(LIBOBJS) $(LDFLAGS) -o netpoll $(NETLIBS)
 
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
@@ -96,23 +104,19 @@ netpoll: netpoll.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
 #
 #
 
-citserver: 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 $(AUTH) $(LIBOBJS:.o=.ro)
-       $(CC) \
-               citserver.ro user_ops.ro room_ops.ro file_ops.ro support.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 \
-               $(AUTH) $(LIBOBJS:.o=.ro)\
-               $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) -o citserver
+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 $(AUTH) $(LIBOBJS:.o=.ro)
+
+citserver: $(SERV_OBJS)
+       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(NETLIBS) $(GDBM) -o citserver
 
 .c.ro:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
 
 modules/serv_chat.so: serv_chat.mo
-       $(CC) -shared -o modules/serv_chat.so serv_chat.mo
+       $(LINK_SHARED) -o modules/serv_chat.so serv_chat.mo
 
 modules/serv_chat.mo: serv_chat.mo
        ln -f serv_chat.mo modules
@@ -121,23 +125,44 @@ modules/serv_chat.mo: serv_chat.mo
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) $(PICFLAGS) -DPIC -c $< -o $@
 
 modules/serv_test.so: serv_test.mo
-       $(CC) -shared -o modules/serv_test.so serv_test.mo
+       $(LINK_SHARED) -o modules/serv_test.so serv_test.mo
 
 modules/serv_test.mo: serv_test.mo
        ln -f serv_test.mo modules
 
-modules/serv_upgrade.so: serv_upgrade.mo
-       $(CC) -shared -o modules/serv_upgrade.so serv_upgrade.mo
+modules/serv_smtp.so: serv_smtp.mo
+       $(LINK_SHARED) -o modules/serv_smtp.so serv_smtp.mo
 
-modules/serv_upgrade.mo: serv_upgrade.mo
-       ln -f serv_upgrade.mo modules
+modules/serv_smtp.mo: serv_smtp.mo
+       ln -f serv_smtp.mo modules
 
 modules/serv_expire.so: serv_expire.mo
-       $(CC) -shared -o modules/serv_expire.so serv_expire.mo
+       $(LINK_SHARED) -o modules/serv_expire.so serv_expire.mo
 
 modules/serv_expire.mo: serv_expire.mo
        ln -f serv_expire.mo modules
 
+modules/serv_icq.so: serv_icq.mo
+       $(LINK_SHARED) -o modules/serv_icq.so serv_icq.mo
+
+modules/serv_icq.mo: serv_icq.mo
+       ln -f serv_icq.mo modules
+
+modules/serv_upgrade.so: serv_upgrade.mo
+       $(LINK_SHARED) -o modules/serv_upgrade.so serv_upgrade.mo
+
+modules/serv_upgrade.mo: serv_upgrade.mo
+       ln -f serv_upgrade.mo modules
+
+modules/serv_vcard.so: serv_vcard.mo vcard.mo
+       $(LINK_SHARED) -o modules/serv_vcard.so serv_vcard.mo vcard.mo
+
+modules/serv_vcard.mo: serv_vcard.mo
+       ln -f serv_vcard.mo modules
+
+modules/vcard.mo: vcard.mo
+       ln -f vcard.mo modules
+
 aidepost: aidepost.o config.o $(LIBOBJS)
        $(CC) aidepost.o config.o $(LIBOBJS) $(LDFLAGS) -o aidepost
 
@@ -151,7 +176,7 @@ netmailer: netmailer.o internetmail.o config.o
 
 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
+       $(LIBOBJS) $(LDFLAGS) -o netproc $(NETLIBS) $(GDBM)
 
 citmail: citmail.o config.o internetmail.o $(LIBOBJS)
        @echo "*"
@@ -165,7 +190,7 @@ mailinglist: mailinglist.o config.o internetmail.o
        $(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist
 
 setup: setup.o tools.o
-       $(CC) setup.o tools.o $(CURSES) $(LDFLAGS) -o setup
+       $(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o setup
 
 chkpwd: chkpwd.o auth.o config.o
        $(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
@@ -174,14 +199,14 @@ netsetup: netsetup.o config.o
        $(CC) netsetup.o config.o $(LDFLAGS) -o netsetup
 
 proxy: proxy.o ipc_c_tcp.o
-       $(CC) proxy.o ipc_c_tcp.o $(LDFLAGS) -o proxy
+       $(CC) proxy.o ipc_c_tcp.o $(LDFLAGS) -o proxy $(NETLIBS)
 
-whobbs$(SUFFIX): whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS)
-       $(CC) whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS) $(LDFLAGS) -o whobbs
+whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS)
+       $(CC) whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(NETLIBS)
 
 sendcommand: sendcommand.o ipc_c_tcp.o tools.o config.o $(LIBOBJS)
        $(CC) sendcommand.o ipc_c_tcp.o tools.o config.o \
-        $(LIBOBJS) $(LDFLAGS) -o sendcommand
+        $(LIBOBJS) $(LDFLAGS) -o sendcommand $(NETLIBS)
 
 qpdecode: qpdecode.o
        $(CC) qpdecode.o $(LDFLAGS) -o qpdecode
@@ -191,7 +216,7 @@ base64: base64.o
 
 userlist: userlist.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) userlist.o ipc_c_tcp.o tools.o \
-       $(LIBOBJS) $(LDFLAGS) -o userlist
+       $(LIBOBJS) $(LDFLAGS) -o userlist $(NETLIBS)
 
 msgform: msgform.o
        $(CC) msgform.o $(LDFLAGS) -o msgform
@@ -208,7 +233,7 @@ rcit: rcit.o config.o
        @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
+       $(CC) stats.o ipc_c_tcp.o tools.o config.o $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS)
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
@@ -221,19 +246,19 @@ install-data:
        done
        @for i in citadel.rc public_clients \
                 `find help messages network -type f | grep -v CVS`; do \
-               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
+               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
-       @if test -d $(root)/etc/pam.d; then \
-               $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
+       -@if test -d $(root)/etc/pam.d; then \
                echo $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
+               $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
        fi
 
 install-doc:
        @./mkinstalldirs $(root)$(prefix)/techdoc
        @for i in *.txt `find techdoc -type f | grep -v CVS`; do \
-               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
+               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
 
 install-exec: all weekly
@@ -244,13 +269,13 @@ install-exec: all weekly
                 $(PROXY_TARGETS) $(SERV_MODULES) utilsmenu weekly \
                 dnetsetup; do \
                if test -f $$i; then \
-                       $(INSTALL) $$i $(root)$(prefix)/$$i; \
                        echo $(INSTALL) $$i $(root)$(prefix)/$$i; \
+                       $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
-       @if test -f $(root)$(prefix)/chkpwd; then \
+       @if test x`find $(root)$(prefix)/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \
+               echo chmod u+s $(root)$(prefix)/chkpwd; \
                chmod u+s $(root)$(prefix)/chkpwd; \
-               echo chmod +s $(root)$(prefix)/chkpwd; \
        fi
 
 clean:
@@ -261,12 +286,12 @@ cleaner: clean
                modules/*.[ms]o $(PROXY_TARGETS) so_locations
 
 distclean: cleaner
+       find . -name '*~' -or -name '.#*' | xargs rm -f
        rm -f Makefile sysdep.h config.cache config.log config.status *.d weekly
-       rm -f `find . -name '*~'` `find . -name '.#*'`
 
 .c.d:
        @echo Checking dependencies for $<
-       @$(CC) -M $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*.ro $*.mo $@!' > $@
+       @$(CC) -M $(CPPFLAGS) $(PTHREAD_DEFS) $< | sed -e 's!$*.o!$*.o $*.ro $*.mo $@!' > $@
        @test -s $@ || rm -f $@
 
 Makefile: $(srcdir)/Makefile.in config.status