update Makefiles

diff --git a/Makefile.am b/Makefile.am
index 9b8e8a27f4e8cb22f77c9c1ab647d1fb0cdfae20..9ffdc0c450c82f6570b6deae7f89cce7c803a008 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,10 +83,9 @@ EXTRA_DIST = account.h ascii.h attach.h browser.h buffer.h buffy.h ChangeLog \
        mutt_sasl_plain.h mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h myvar.h \
        nntp.h OPS OPS.CRYPT OPS.MIX OPS.NOTMUCH OPS.PGP OPS.SIDEBAR OPS.SMIME \
        pager.h PATCHES patchlist.sh pgp.h pgpewrap.c pgplib.h pgppacket.h \
-       pop.h protos.h README.md README.neomutt README.notmuch README.SECURITY \
-       README.SSL remailer.c remailer.h rfc1524.h rfc2047.h rfc2231.h \
-       rfc3676.h rfc822.h sha1.h sidebar.h smime.h smime_keys.pl sort.h TODO \
-       txt2c.c txt2c.sh UPDATING UPDATING.kz version.h keymap_alldefs.h
+       pop.h protos.h README.md README.SECURITY README.SSL remailer.c remailer.h \
+       rfc1524.h rfc2047.h rfc2231.h rfc3676.h rfc822.h sha1.h sidebar.h smime.h \ 
+       smime_keys.pl sort.h txt2c.c txt2c.sh UPDATING version.h keymap_alldefs.h
 
 EXTRA_SCRIPTS = smime_keys
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8d2888b2edcf602f8fb8bd4a4c75722684698d52..15655dda5eaed492bc62ccbe965ca328e5d9e1df 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = dotlock.man              \
        Muttrc Muttrc.head stamp-doc-rc \
        makedoc.c makedoc_defs.h        \
        mutt.css mutt.xsl html.xsl chunk.xsl \
-       $(BUILT_DISTFILES) $(SAMPLE_MUTTRC) $(SAMPLE_VIMRC) \
+       $(BUILT_DISTFILES) $(SAMPLE_MUTTRC) neomutt-syntax.vim \
        mutt-1.7.0-syntax.vim 
 
 SAMPLE_MUTTRC = muttrc.attach-headers-color muttrc.compress muttrc.cond-date \
@@ -44,11 +44,6 @@ SAMPLE_MUTTRC = muttrc.attach-headers-color muttrc.compress muttrc.cond-date \
        muttrc.reply-with-xorig muttrc.sidebar muttrc.skip-quoted \
        muttrc.status-color muttrc.timeout
 
-SAMPLE_VIMRC = vimrc.attach-headers-color vimrc.compress vimrc.encrypt-to-self \
-       vimrc.forgotten-attachment vimrc.ifdef vimrc.index-color vimrc.keywords \
-       vimrc.new-mail vimrc.nntp vimrc.notmuch vimrc.progress \
-       vimrc.quasi-delete vimrc.reply-with-xorig vimrc.sidebar vimrc.timeout \
-       vimrc.misc
 
 CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
        configuration.html mimesupport.html advancedusage.html \
@@ -62,7 +57,7 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt  \
        devel-notes.txt patch-notes.txt smime-notes.txt
 
 topsrcdir_DOCFILES = COPYRIGHT LICENSE.md INSTALL ChangeLog ChangeLog.neomutt  \
-       README NEWS TODO README.SECURITY README.SSL README.neomutt README.notmuch
+       README.SECURITY README.SSL README.md
 
 all: makedoc-all
 

diff --git a/imap/Makefile.am b/imap/Makefile.am
index 048a2f0ca599a36a08b232f8a8237283a53bd7b7..410ca6b9eb8a9a35dcd3b19504c2c4bbe8797b65 100644 (file)
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/flymake.am
 
 AUTOMAKE_OPTIONS = 1.6 foreign
 
-EXTRA_DIST = README TODO auth_anon.c auth_cram.c auth_gss.c auth_sasl.c
+EXTRA_DIST = README auth_anon.c auth_cram.c auth_gss.c auth_sasl.c
 
 AM_CPPFLAGS = -I$(top_srcdir)