X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=060f8df64c46003fc69eb0fab186ad4d33ecddd8;hb=ef347e598ab670b87e178af7fc6b00795494303a;hp=e218b1539fd2592a750bac9fe6872e6005337213;hpb=e94bdae14683fd1581f905365fe6eb3b94e90d21;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index e218b1539..060f8df64 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -30,7 +30,7 @@ all: buildinfo $(TARGETS)
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
+CLIENT_TARGETS=citadel$(EXEEXT)
 NOINST_TARGETS=stress$(EXEEXT)
 SERVER_TARGETS=citserver$(EXEEXT)
 SERV_MODULES= md5.o \
@@ -41,8 +41,8 @@ include Make_modules
 UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
 UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
-	chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \
-	getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \
+	chkpw$(EXEEXT) chkpwd$(EXEEXT) \
+	aidepost$(EXEEXT) msgform$(EXEEXT) \
 	ctdlmigrate$(EXEEXT)
 
 
@@ -74,9 +74,9 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
+SOURCES=utils/aidepost.c utils/stress.c utils/citmail.c \
 	utils/setup.c utils/msgform.c utils/chkpw.c \
-	utils/sendcommand.c utils/getmail.c utils/userlist.c \
+	utils/sendcommand.c \
 	utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \
 	utillib/citadel_ipc.c utillib/citadel_dirs.c utillib/ipc_c_tcp.c \
 	textclient/client_chat.c textclient/client_passwords.c \
@@ -168,8 +168,8 @@ citserver$(EXEEXT): $(SERV_OBJS)
 	echo "CC $<"
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-aidepost$(EXEEXT): utils/aidepost.o config.o
-	$(CC) utils/aidepost.o config.o utillib/citadel_dirs.o \
+aidepost$(EXEEXT): utils/aidepost.o utillib/citadel_dirs.o
+	$(CC) utils/aidepost.o utillib/citadel_dirs.o \
 		$(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
 
 citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o
@@ -192,37 +192,19 @@ chkpw$(EXEEXT): utils/chkpw.o auth.o utillib/citadel_dirs.o
 	$(CC) utils/chkpw.o auth.o utillib/citadel_dirs.o \
 		$(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
-whobbs$(EXEEXT): utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-		utillib/citadel_dirs.o $(LIBOBJS)
-	$(CC) utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-		utillib/citadel_dirs.o $(LIBOBJS) \
-		$(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS)
-
 stress$(EXEEXT): utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
 		utillib/citadel_dirs.o $(LIBOBJS)
 	$(CC) utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
 		utillib/citadel_dirs.o $(LIBOBJS) \
 		$(LDFLAGS) -o stress$(EXEEXT) $(LIBS)
 
-sendcommand$(EXEEXT): utils/sendcommand.o $(LIBOBJS)
-	$(CC) utils/sendcommand.o \
+sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS)
+	$(CC) utils/sendcommand.o utillib/citadel_dirs.o \
 		$(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
-getmail$(EXEEXT): utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-		config.o  $(LIBOBJS)
-	$(CC) utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-		config.o utillib/citadel_dirs.o \
-		$(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS)
-
 base64$(EXEEXT): utils/base64.o
 	$(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT)
 
-userlist$(EXEEXT): utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-		utillib/citadel_dirs.o $(LIBOBJS)
-	$(CC) utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-		utillib/citadel_dirs.o \
-		$(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS)
-
 msgform$(EXEEXT): utils/msgform.o
 	$(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
 
@@ -301,7 +283,7 @@ install-data-new:
 		echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 		$(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 	fi
-	@for i in bio bitbucket files images info userpics; do \
+	@for i in bio bitbucket files images info userpics netconfigs; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -341,7 +323,7 @@ install-doc-new:
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-	@for i in bio bitbucket files images info userpics; do \
+	@for i in bio bitbucket files images info userpics netconfigs; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \