X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=34458a61cbe045570d9d49fabb0d78f204bc51cc;hb=6cd4b62a62098566ed73d7662d22e29fc509b9f3;hp=f66349272425d6d4d658f923e5a74b10282ee8cf;hpb=99f12b7b0638f80c89d49d6206434294525e3a20;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index f66349272..34458a61c 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -24,25 +24,21 @@ HELP_DIR=@MAKE_HELP_DIR@
 DOC_DIR=@MAKE_DOC_DIR@
 UTILBIN_DIR=@MAKE_UTILBIN_DIR@
 DEPEND_FLAG=@DEPEND_FLAG@
-all: $(TARGETS)
+all: buildinfo $(TARGETS)
 
 .SUFFIXES: .o .d .c
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
-NOINST_TARGETS=stress$(EXEEXT)
 SERVER_TARGETS=citserver$(EXEEXT)
-SERV_MODULES= md5.o \
-	ical_dezonify.o
 
 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,22 +70,18 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
+SOURCES=utils/aidepost.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 \
-	textclient/commands.c textclient/messages.c textclient/rooms.c \
-	textclient/routines.c textclient/routines2.c textclient/tuiconfig.c \
-	textclient/citadel.c textclient/screen.c \
+	utillib/citadel_dirs.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
-	domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \
+	domain.c serv_extensions.c genstamp.c \
 	housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
-	locate_host.c md5.c auth.c msgbase.c parsedate.c \
-	room_ops.c euidindex.c server_main.c snprintf.c ldap.c \
+	locate_host.c auth.c msgbase.c parsedate.c \
+	room_ops.c euidindex.c server_main.c ldap.c \
 	support.c sysdep.c user_ops.c journaling.c threads.c \
-	context.c event_client.c
+	context.c netconfig.c nttlist.c md5.c
 
 
 include Make_sources
@@ -106,7 +98,7 @@ mkdir-init:
 	@for d in `/bin/ls $(VPATH)/user_modules/`; do \
 		(mkdir -p user_modules/$$d ) ; \
 	done
-	mkdir -p utils utillib textclient
+	mkdir -p utils utillib
 	mkdir locale
 
 svn_revision.c: ${SOURCES}
@@ -115,26 +107,11 @@ svn_revision.c: ${SOURCES}
 DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
 noinst: $(NOINST_TARGETS)
-client: $(CLIENT_TARGETS)
 
 server: $(SERVER_TARGETS) $(SERV_MODULES)
 
 utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 
-citadel$(EXEEXT): textclient/citadel.o utillib/citadel_ipc.o \
-		textclient/client_chat.o textclient/client_passwords.o \
-		textclient/commands.o utillib/ipc_c_tcp.o md5.o \
-		textclient/messages.o textclient/rooms.o textclient/routines.o \
-		textclient/routines2.o textclient/tuiconfig.o \
-		textclient/screen.o utillib/citadel_dirs.o ecrash.o $(LIBOBJS)
-	$(CC) textclient/citadel.o utillib/citadel_ipc.o \
-		textclient/client_chat.o textclient/client_passwords.o \
-		textclient/commands.o utillib/ipc_c_tcp.o md5.o \
-		textclient/messages.o textclient/rooms.o textclient/routines.o \
-		textclient/routines2.o textclient/tuiconfig.o \
-		textclient/screen.o utillib/citadel_dirs.o ecrash.o $(LIBOBJS) \
-		$(LDFLAGS) -o citadel $(LIBS)
-
 .y.c:
 	$(YACC) $(YFLAGS) $<
 	mv -f y.tab.c $@
@@ -150,16 +127,16 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \
+SERV_OBJS = server_main.o utillib/citadel_dirs.o \
 	user_ops.o citserver.o sysdep.o serv_extensions.o \
 	$(DATABASE:.c=.o) domain.o \
 	control.o config.o support.o room_ops.o \
-	file_ops.o msgbase.o euidindex.o \
-	locate_host.o housekeeping.o \
+	msgbase.o euidindex.o \
+	locate_host.o housekeeping.o ical_dezonify.o \
 	internet_addressing.o journaling.o \
 	parsedate.o genstamp.o ecrash.o threads.o context.o \
 	clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
-	svn_revision.o ldap.o
+	svn_revision.o ldap.o netconfig.o nttlist.o md5.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
 	$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
@@ -168,8 +145,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,39 +169,13 @@ 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 utillib/ipc_c_tcp.o \
-		utillib/citadel_ipc.o config.o  $(LIBOBJS)
-	$(CC) utils/sendcommand.o utillib/ipc_c_tcp.o \
-		utillib/citadel_ipc.o config.o utillib/citadel_dirs.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)
 
@@ -263,7 +214,7 @@ install-data:
 		 network/systems; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
-	@for i in funambol_newmail_soap.xml notify_about_newmail.js citadel.rc public_clients citadel_urlshorteners.rc \
+	@for i in notify_about_newmail.js public_clients citadel_urlshorteners.rc \
 		 `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -280,7 +231,6 @@ install-data-new:
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
 	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
 	$(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc
-	$(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
 	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
@@ -291,7 +241,7 @@ install-data-new:
 	done
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-	@for i in  funambol_newmail_soap.xml notify_about_newmail.js \
+	@for i in  notify_about_newmail.js \
 		 `find $(srcdir)/help -type f | grep -v .svn`; do \
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
@@ -303,7 +253,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 files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -343,10 +293,10 @@ 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 files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
-	@for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
+	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
 		if test -f $$i; then \
 			echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
 			$(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -384,12 +334,6 @@ install-exec-new: all
 	done
 
 	$(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail;
-	@for i in $(CLIENT_TARGETS); do \
-		if test -f $$i; then \
-			echo $(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \
-			$(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \
-		fi \
-	done
 	@for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \
 		if test -f $(srcdir)/$$i; then \
 			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
@@ -398,39 +342,37 @@ install-exec-new: all
 	done
 
 clean:
-	rm -fr locale/*
-	rm -f *.o 
-	rm -f utils/*.o ;\
-	rm -f utillib/*.o ;\
-	rm -f textclient/*.o ;\
+	rm -vfr locale/*
+	rm -vf *.o 
+	rm -vf utils/*.o ;\
+	rm -vf utillib/*.o ;\
 	for i in $(srcdir)/modules/* ; do \
-		rm -f $$i/*.o ;\
+		rm -vf $$i/*.o ;\
 	done
 	if test -d $(srcdir)/user_modules ; then \
 		for i in $(srcdir)/user_modules/* ; do \
-			rm -f $$i/*.o ;\
+			rm -vf $$i/*.o ;\
 		done \
 	fi
-	rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
+	rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
 
 cleaner: clean
-	rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
-	rm -rf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
+	rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
+	rm -vrf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
 
 distclean: cleaner
-	find . -name '*~' -o -name '.#*' | xargs rm -f
-	rm -f po/Makefile 
-	rm -f Makefile sysdep.h config.cache config.log config.status *.d 
-	rm -f utils/*.d ;
-	rm -f utillib/*.d ;
-	rm -f textclient/*.d ;
+	find . -name '*~' -o -name '.#*' | xargs rm -vf
+	rm -vf po/Makefile 
+	rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d 
+	rm -vf utils/*.d ;
+	rm -vf utillib/*.d ;
 	for i in $(srcdir)/modules/* ; do \
-		rm -f $$i/*.d ;\
+		rm -vf $$i/*.d ;\
 	done
 	if test -d $(srcdir)/user_modules ; then \
 		for i in $(srcdir)/user_modules/* ; do \
-			rm -f $$i/*.o ;\
+			rm -vf $$i/*.o ;\
 		done \
 	fi
 
@@ -451,4 +393,11 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
 	cd $(srcdir) && $(ACLOCAL)
 
+buildinfo:
+	echo
+	echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@"
+	echo "Compile: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
+	echo "LDFLAGS: $(LDFLAGS)"
+	echo
+
 -include $(DEP_FILES)