X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=b7fbfcc990ba79d38948c5e9d19ddf0deae4e527;hp=fae6d91dfb88f35413662667528c504d9ccd509f;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=201fd8633cc86ccda413c919ae6e2ae04e89b4a9

diff --git a/Makefile.am b/Makefile.am
index fae6d91..b7fbfcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-	  lib-lib lib-mime lib-crypt lib-hash lib-ui lib \
+	  lib-lib lib-mime lib-crypt lib-hash lib-network lib-ui lib \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h
@@ -27,13 +27,12 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
 	pager.c pattern.c postpone.c query.c \
 	recvattach.c recvcmd.c rfc1524.c rfc3676.c \
 	score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
-	thread.c url.c utf8.c wcwidth.c \
-	account.c mutt_socket.c mutt_tunnel.c
+	thread.c url.c utf8.c wcwidth.c account.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 	       -Limap -limap -Lpop -lpop $(LIBNNTP) \
 	       -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
-	       -Llib-ui -lui \
+	       -Llib-network -lnetwork -Llib-ui -lui \
 	       -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
@@ -63,8 +62,7 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(GPGME_CFLAGS) -
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 EXTRA_madmutt_SOURCES = \
-	account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
-	mutt_tunnel.c resize.c dotlock.c remailer.c \
+	account.c mutt_sasl.c resize.c dotlock.c remailer.c \
 	alias.h browser.h mbyte.h remailer.h url.h state.h \
 	mutt_idna.h mutt_libesmtp.c sidebar.h state.h
 
@@ -74,8 +72,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	dotlock.h functions.def gen_defs \
 	recvattach.h handler.h thread.h \
 	globals.h history.h init.h keymap.h mutt_crypt.h \
-	mime.h mutt.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
-	mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
+	mime.h mutt.h mutt_sasl.h mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
 	rfc3676.h sort.h mime.types autogen.sh \
 	OPS.MIX remailer.c remailer.h browser.h state.h \
 	mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h madmuttrc.head madmuttrc \