* Completed migrating the "netpoll" utility into the serv_network module.

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 8393acd405223bdd456802e364f211d9493113f0..879ed119931504c933b45364a00e1f2d1223b96a 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -41,7 +41,7 @@ SERV_MODULES=modules/libchat.la modules/libvcard.la \
        modules/libvandelay.la \
        modules/libical.la
 UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
-       stats citmail netpoll mailinglist userlist sendcommand \
+       stats citmail mailinglist userlist sendcommand \
        base64 qpdecode
 
 prefix=@prefix@
@@ -84,7 +84,7 @@ SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
        config.c control.c $(DATABASE) 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 rcit.c readlog.c \
+       netproc.c netsetup.c policy.c rcit.c readlog.c \
        room_ops.c rooms.c routines.c routines2.c serv_chat.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 \
@@ -121,10 +121,6 @@ citadel$(EXEEXT): ipc_c_tcp$(CX) citadel$(CX) rooms$(CX) routines$(CX) \
        client_passwords$(CX) md5$(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 \
-       $(LIBOBJS) $(LDFLAGS) -o netpoll $(NETLIBS)
-
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
 
@@ -145,12 +141,12 @@ LIBSERV_OBJS = user_ops.lo citserver.lo sysdep.lo dynloader.lo tools.lo $(DATABA
        parsedate.lo genstamp.lo clientsocket.lo $(AUTH) $(LIBOBJS:.o=.lo)
 
 libcitserver.la: $(LIBSERV_OBJS)
-       $(LIBTOOL) $(CC) -rpath $(prefix) -no-undefined -avoid-version \
-       -o libcitserver.la $(LIBSERV_OBJS) $(GDBM)
+       $(LIBTOOL) $(CC) $(LDFLAGS) -rpath $(prefix) -no-undefined -avoid-version \
+       -o libcitserver.la $(LIBSERV_OBJS) $(GDBM) $(LIBS) $(PTHREAD_LIBS) $(NETLIBS) $(RESOLV)
 
 citserver: $(SERV_OBJS) $(LIBTOOL) libcitserver.la
-       $(LIBTOOL) --mode=link $(CC) $(SERV_OBJS) $(LDFLAGS) $(PTHREAD_LIBS) \
-       $(LIBS) $(NETLIBS) $(RESOLV) libcitserver.la -o citserver
+       $(LIBTOOL) --mode=link $(CC) $(SERV_OBJS) $(LDFLAGS) libcitserver.la -o \
+       citserver $(PTHREAD_LIBS)
 
 .c.ro:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@