X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=36339dac15493b5c5cf81de41ff1413c34d7dedb;hp=7b69a8f9d1d8e8b4dfd74ff154172d1b694175e5;hb=48a027c4e8a676bc53de48f88b09d34347c23f28;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982

diff --git a/Makefile.am b/Makefile.am
index 7b69a8f..36339da 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-mime lib-lib lib-crypt lib-hash lib-network lib-ui lib \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h
@@ -19,21 +19,20 @@ bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
 	alias.c attach.c base64.c browser.c buffy.c \
 	charset.c compress.c commands.c complete.c \
-	compose.c copy.c editmsg.c enter.c \
+	compose.c copy.c editmsg.c \
 	flags.c filter.c from.c getdomain.c \
 	handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
 	init.c keymap.c lib.c \
-	main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
+	main.c mbox.c mbyte.c mh.c muttlib.c mutt_idna.c mx.c \
 	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,27 +62,22 @@ 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 \
-	alias.h browser.h enter.h \
-	mbyte.h remailer.h url.h state.h \
+	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
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
-	configure acconfig.h \
-	account.h alias.h attach.h recvattach.h handler.h thread.h \
+	configure account.h alias.h attach.h recvattach.h handler.h thread.h \
 	buffy.h charset.h compress.h copy.h \
 	dotlock.h functions.def gen_defs \
-	enter.h recvattach.h handler.h thread.h \
+	recvattach.h handler.h thread.h \
 	globals.h history.h init.h keymap.h mutt_crypt.h \
-	mime.h mutt.h mutt_menu.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 \
-	_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
+	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 \
 	makedoc.c stamp-doc-rc README.SSL smime.h\
-	depcomp mutt_idna.h regex.c mutt_libesmtp.h crypt-gpgme.h
+	depcomp mutt_idna.h mutt_libesmtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@