Remove unnecessary workaround for automake dist target

diff --git a/ChangeLog b/ChangeLog
index b2f5e2387c9b6af1eeb42898005211d84307084a..4884584525f147ab1577833d5bb29915ee41f0f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-06 18:23 +0100  Rocco Rutte  <pdmef@gmx.net>  (1770ab532bfd)
+
+       * curs_lib.c, imap/imap.c, imap/message.c, mbox.c, mh.c,
+       mutt_curses.h, pattern.c, pop.c, pop_lib.c, smtp.c: Add
+       percentages to progress bar optionally supplied by caller. This is
+       necessary to let the mbox driver print useful percentages. If
+       there's no percentage given and we have a size, calculate on it on
+       our own.  Closes #2929.
+
 2007-11-06 17:22 +0100  Rocco Rutte  <pdmef@gmx.net>  (eae335942190)
 
        * mh.c: (Re-)Add total msg count to progress for parsing maildirs
@@ -8,9 +17,9 @@
 
 2007-11-05 17:47 +0100  Rocco Rutte  <pdmef@gmx.net>  (6b9e91edba54)
 
-       * ChangeLog, curs_lib.c: Save value of errno across mutt_endwin()
-       calls. Mutt_endwin() is sometimes called after noticing an error but
-       before printing the message via perror(). Closes #2965.
+       * curs_lib.c: Save value of errno across mutt_endwin()
+       calls. Mutt_endwin() is sometimes called after noticing an error
+       but before printing the message via perror(). Closes #2965.
 
 2007-11-05 15:53 +0100  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (b8dc6926ddf4)
 
@@ -18,13 +27,9 @@
 
 2007-11-05 14:53 +0100  Rocco Rutte  <pdmef@gmx.net>  (ad7983699656)
 
-       * ChangeLog, doc/manual.xml.head: Manual: Improve [un]mailboxes
+       * doc/manual.xml.head: Manual: Improve [un]mailboxes
        documentation. Closes #2204.
 
-2007-11-05 14:52 +0100  Rocco Rutte  <pdmef@gmx.net>  (3bac5aa1af75)
-
-       * hg-commit: hg-commit: Exclude merges when writing ChangeLog
-
 2007-11-05 12:11 +0100  Ralf Wildenhues  <wildenhues@ins.uni-bonn.de>  (645fcdd66828)
 
        * configure.ac, intl/Makefile.in, po/Makefile.in.in: Optionally define
@@ -34,7 +39,7 @@
 
 2007-11-04 13:19 -0800  Vsevolod Volkov  <vvv@mutt.org.ua>  (dc5ec6dbb278)
 
-       * ChangeLog, po/ru.po: Updated Russian translation
+       * po/ru.po: Updated Russian translation
 
 2007-11-04 13:17 -0800  Ivan Vilata i Balaguer  <ivan@selidor.net>  (1f72281eb36c)
 

diff --git a/Makefile.am b/Makefile.am
index 64f2919b0e2367edf8666803c214055a688636da..670e3e7ddbdba59c53049326706deae1769049ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
 
 bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
-mutt_SOURCES = $(BUILT_SOURCES) \
+mutt_SOURCES = \
        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
        crypt.c cryptglue.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
@@ -31,6 +31,8 @@ mutt_SOURCES = $(BUILT_SOURCES) \
        muttlib.c editmsg.c mbyte.c \
        url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h
 
+nodist_mutt_SOURCES = $(BUILT_SOURCES)
+
 mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
        $(INTLLIBS) $(LIBICONV)  $(GPGME_LIBS)
 
@@ -93,9 +95,7 @@ pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 mutt_dotlock.c: dotlock.c
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
-CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
-       keymap_alldefs.h keymap_defs.h patchlist.c \
-       reldate.h
+CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc keymap_alldefs.h $(BUILT_SOURCES)
 
 DISTCLEANFILES= flea Muttrc smime_keys
 
@@ -189,11 +189,6 @@ update-changelog:
        sh ./mkchangelog.sh | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
        $${VISUAL:-vi} ChangeLog)
 
-# kluge around automake problems.
-
-dist-hook:
-       -for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-
 mutt-dist:
        (cd $(srcdir) && ./build-release )