Mon Aug 24 20:04:04 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 76b585e39d8a1e594ff1bdbf463f3dec9f2d2ca6..a2a3246cf4b18f6d6cde3e7e3ef3b1fdf67fdbb7 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -10,20 +10,24 @@
 #
 ########################################################################
 
-client: citadel whobbs
+CLIENT_TARGETS=citadel whobbs
+SERVER_TARGETS=citserver setup citadelapi.a
+UTIL_TARGETS=aidepost netmailer netproc netsetup msgform \
+       readlog rcit stats citmail netpoll mailinglist userlist
 
-server: citserver setup
+client: $(CLIENT_TARGETS)
 
-utils: aidepost netmailer netproc netsetup msgform \
-readlog rcit stats sysoputil citmail netpoll mailinglist userlist
+server: $(SERVER_TARGETS)
+
+utils: $(UTIL_TARGETS)
 
 #
 #
 
 citadel: ipc_c_tcp.o citadel.o rooms.o routines.o routines2.o messages.o \
-       commands.o client_chat.o
+       commands.o client_chat.o serv_info.o
        $(CC) $(CFLAGS) ipc_c_tcp.o citadel.o rooms.o routines.o routines2.o \
-       messages.o commands.o client_chat.o $(LFLAGS) -o citadel
+       messages.o commands.o client_chat.o serv_info.o $(LFLAGS) -o citadel
 
 netpoll: netpoll.c config.o ipc_c_tcp.o
        $(CC) $(CFLAGS) netpoll.c config.o ipc_c_tcp.o $(LFLAGS) -o netpoll
@@ -31,9 +35,6 @@ netpoll: netpoll.c config.o ipc_c_tcp.o
 ipc_c_tcp.o: ipc_c_tcp.c sysdep.h
        $(CC) $(CFLAGS) -c ipc_c_tcp.c
 
-ipc_c_socks4.o: ipc_c_socks4.c sysdep.h
-       $(CC) $(CFLAGS) -c ipc_c_socks4.c
-
 citadel.o: citadel.c axdefs.h citadel.h
        $(CC) -O $(CFLAGS) -c citadel.c
 
@@ -55,13 +56,16 @@ routines2.o: routines2.c citadel.h
 client_chat.o: client_chat.c citadel.h
        $(CC) -O $(CFLAGS) -c client_chat.c
 
+serv_info.o: serv_info.c citadel.h
+       $(CC) -O $(CFLAGS) -c serv_info.c
+
 
 #
 #
 
 citserver: citserver.o user_ops.o support.o room_ops.o file_ops.o \
        msgbase.o config.o sysdep.o locate_host.o serv_chat.o \
-       hooks.o housekeeping.o database.o control.o logging.o
+       hooks.o housekeeping.o database.o control.o logging.o 
        $(CC) $(CFLAGS) citserver.o user_ops.o room_ops.o file_ops.o support.o \
                msgbase.o config.o sysdep.o locate_host.o serv_chat.o \
                hooks.o housekeeping.o database.o control.o logging.o \
@@ -106,12 +110,19 @@ control.o: control.c citadel.h
 logging.o: logging.c citadel.h
        $(CC) $(CFLAGS) -D_REENTRANT -c logging.c
 
-config.o: config.c config_decls.h citadel.h axdefs.h
+config.o: config.c citadel.h axdefs.h
        $(CC) -O $(CFLAGS) -D_REENTRANT -c config.c
 
 sysdep.o: sysdep.c citadel.h
        $(CC) -O $(CFLAGS) -D_REENTRANT -c sysdep.c
 
+citadelapi.a: citadelapi.o ipc_c_tcp.o serv_info.o
+       $(AR) r citadelapi.a citadelapi.o ipc_c_tcp.o serv_info.o
+       $(RANLIB) citadelapi.a
+
+citadelapi.o: citadelapi.c citadel.h
+       $(CC) -O $(CFLAGS) -D_REENTRANT -c citadelapi.c
+
 aidepost: aidepost.c config.o citadel.h
        $(CC) -O $(CFLAGS) aidepost.c config.o $(LFLAGS) -o aidepost
 
@@ -176,13 +187,14 @@ rcit: rcit.c config.o citadel.h
 stats: stats.c config.o citadel.h
        $(CC) -O $(CFLAGS) stats.c config.o $(LFLAGS) -o stats
 
-sysoputil: sysoputil.c config.o config_decls.h citadel.h
-       $(CC) -O $(CFLAGS) sysoputil.c config.o $(LFLAGS) -o sysoputil
-       chmod 4750 sysoputil
-
 citadel.h: sysdep.h sysconfig.h ipcdef.h server.h
        touch citadel.h
 
 clean:
        find . -name \*.[o] -print -exec rm -f {} \;
+
+cleaner: clean
+       rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS)
+
+realclean: cleaner
        rm -f sysdep.h