Use m_tempfile and better errors msg

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6ee39c9..8bc2864 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,10 @@ EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
 
 if BUILD_NNTP
 NNTP_SUBDIR = nntp
-NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-         lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \
+         lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
          pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h charset.gperf
@@ -18,18 +17,17 @@ DISTCLEANFILES = $(BUILT_SOURCES)
 
 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 \
+       alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
        compose.c copy.c editmsg.c init.c keymap.c lib.c \
-       flags.c from.c handler.c hcache.c headers.c help.c hook.c \
-       main.c mbox.c mh.c muttlib.c mutt_idna.c mx.c \
-       pager.c pattern.c postpone.c recvattach.c recvcmd.c \
+       flags.c from.c handler.c headers.c help.c hook.c \
+       main.c muttlib.c mutt_idna.c pager.c pattern.c postpone.c recvattach.c recvcmd.c \
        score.c send.c sendlib.c sort.c state.c thread.c account.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+              -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \
-              -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
-              -Llib-sys -lsys -Llib-ui -lui \
-              -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+              -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui \
+              $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(top_builddir)/lib-lib/liblib.a \
@@ -37,7 +35,7 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(top_builddir)/lib-crypt/libcrypt.a \
                       $(top_builddir)/lib-hash/libhash.a \
                       $(top_builddir)/lib-ui/libui.a \
-                      $(top_builddir)/lib/libsane.a \
+                      $(top_builddir)/lib-mx/libmx.a \
                       \
                       $(top_builddir)/pop/libpop.a  \
                       $(top_builddir)/imap/libimap.a \
@@ -53,7 +51,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
        -DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
 
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(GPGME_CFLAGS) -Iintl
+INCLUDES=-I$(top_srcdir) $(GPGME_CFLAGS) -Iintl
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
@@ -64,9 +62,9 @@ EXTRA_madmutt_SOURCES = \
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.MIX TODO \
        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 \
+       buffy.h charset.h copy.h dotlock.h functions.def gen_defs \
        recvattach.h handler.h thread.h globals.h init.h keymap.h \
-       mime.h mutt.h mutt_sasl.h mbox.h mh.h mx.h pager.h protos.h \
+       mime.h mutt.h mutt_sasl.h pager.h protos.h \
        sort.h mime.types autogen.sh remailer.c remailer.h browser.h state.h \
        lib.h extlib.c pgpewrap.c smime_keys.pl Madmuttrc.head Madmuttrc \
        makedoc.c stamp-doc-rc README.SSL depcomp mutt_idna.h mutt_libesmtp.h
@@ -77,7 +75,7 @@ madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
 
 pgpringng_SOURCES = pgppubring.c lib.c extlib.c
 pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
-                 -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt -Llib -lsane
+                 -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt
 pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \
                         $(top_builddir)/lib-lib/liblib.a \
                         $(top_builddir)/lib-hash/libhash.a