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

diff --git a/Makefile.am b/Makefile.am
index b7fbfcc..9d2ae40 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-network lib-ui lib \
+	  lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h
@@ -18,21 +18,19 @@ BUILT_SOURCES = keymap_defs.h version.h
 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 \
-	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 \
+	charset.c compress.c commands.c complete.c  \
+	compose.c copy.c editmsg.c init.c keymap.c lib.c \
+	flags.c filter.c from.c handler.c hcache.c hdrline.c headers.c help.c hook.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 \
+	score.c send.c sendlib.c sidebar.c sort.c state.c status.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-network -lnetwork -Llib-ui -lui \
+	       -Llib-sys -lsys -Llib-ui -lui \
 	       -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
@@ -62,7 +60,7 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(GPGME_CFLAGS) -
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 EXTRA_madmutt_SOURCES = \
-	account.c mutt_sasl.c resize.c dotlock.c remailer.c \
+	account.c mutt_sasl.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
 
@@ -71,7 +69,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	buffy.h charset.h compress.h copy.h \
 	dotlock.h functions.def gen_defs \
 	recvattach.h handler.h thread.h \
-	globals.h history.h init.h keymap.h mutt_crypt.h \
+	globals.h init.h keymap.h mutt_crypt.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 \