build: tidy makefile

This commit makes no changes to the build.
It simply tidies up the whitespace and some lists.

diff --git a/Makefile.am b/Makefile.am
index 43d9ff2b188c233d3efc9f1edf9903438ab85d69..2971f68466c9bcc66a9baea41d0a248eb6b9ac6b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,24 @@
 include $(top_srcdir)/flymake.am
 
 AUTOMAKE_OPTIONS = 1.6 foreign
-EXTRA_PROGRAMS = pgpring pgpewrap mutt_md5
+EXTRA_PROGRAMS = mutt_md5 pgpewrap pgpring
 
 # Test the .tar file by building everything
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-flock --enable-gpgme \
-       --enable-notmuch --with-bdb \
-       --with-gdbm --with-gnutls --with-gss --with-kyotocabinet --with-lmdb \
-       --with-mixmaster --with-qdbm --with-sasl --with-tokyocabinet
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-debug \
+       --enable-flock \
+       --enable-gpgme \
+       --enable-notmuch \
+       --with-bdb \
+       --with-gdbm \
+       --with-gnutls \
+       --with-gss \
+       --with-kyotocabinet \
+       --with-lmdb \
+       --with-mixmaster \
+       --with-qdbm \
+       --with-sasl \
+       --with-tokyocabinet
 
 SUBDIRS = m4 contrib imap ncrypt
 
@@ -29,7 +40,7 @@ bin_SCRIPTS = $(SMIMEAUX_TARGET)
 
 distdir = neo$(PACKAGE)-$(VERSION)
 
-BUILT_SOURCES = keymap_defs.h keymap_alldefs.h git_ver.h conststrings.c
+BUILT_SOURCES = conststrings.c git_ver.h keymap_alldefs.h keymap_defs.h
 
 bin_PROGRAMS = mutt $(PGPAUX_TARGET)
 
@@ -144,10 +155,10 @@ install-data-local:
        fi
 
 uninstall-local:
-       for i in mime.types ; do \
-               if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \
-                       rm $(DESTDIR)$(sysconfdir)/$$i ; \
-               fi ; \
-               rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \
+       for i in mime.types; do \
+               if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i; then \
+                       rm $(DESTDIR)$(sysconfdir)/$$i; \
+               fi; \
+               rm $(DESTDIR)$(sysconfdir)/$${i}.dist; \
        done
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a160dbfb1b2966c6e6b636b932667788fbabc2ec..bd42ec49c80a22a7120337f8f40adb123046581c 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,49 +1,39 @@
 subdir = contrib
 
-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-       sample.mailcap sample.muttrc sample.muttrc-tlr \
-       colors.default colors.linux smime.rc \
-       smime_keys_test.pl
+SAMPLES = colors.default colors.linux gpg.rc Mush.rc pgp2.rc pgp5.rc pgp6.rc \
+       Pine.rc sample.mailcap sample.muttrc sample.muttrc-tlr smime.rc \
+       smime_keys_test.pl Tin.rc
 
-EXTRA_DIST = language.txt language50.txt  \
-       patch.slang-1.2.2.keypad.1      \
-       $(SAMPLES) \
-       iconv/README \
-       iconv/make.sh \
-       vim-keys \
-       keybase \
-       lua \
-       hcache-bench \
-       logo \
-       colorschemes \
-       smime_keys
+EXTRA_DIST = $(SAMPLES) colorschemes hcache-bench iconv/make.sh iconv/README \
+       keybase language.txt language50.txt logo lua \
+       patch.slang-1.2.2.keypad.1 smime_keys vim-keys 
 
-CONTRIB_DIRS = vim-keys keybase lua hcache-bench logo colorschemes
+CONTRIB_DIRS = colorschemes hcache-bench keybase logo lua vim-keys
 
 install-data-local:
        $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-       for f in $(SAMPLES) ; do \
-               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;   \
+       for f in $(SAMPLES); do \
+               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples; \
        done
-       for f in $(srcdir)/iconv/*.rc ; do                                      \
-               $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv   ;     \
+       for f in $(srcdir)/iconv/*.rc; do \
+               $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv; \
        done
-       for d in $(CONTRIB_DIRS); do                                            \
-               echo "Installing $$d" ; \
-               $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$$d ;\
-               for f in $(srcdir)/$$d/*; do    \
-                       echo "Installing $$f" ; \
-                       $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/$$d ; \
+       for d in $(CONTRIB_DIRS); do \
+               echo "Installing $$d"; \
+               $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$$d; \
+               for f in $(srcdir)/$$d/*; do \
+                       echo "Installing $$f"; \
+                       $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/$$d; \
                done \
        done
        chmod +x $(DESTDIR)$(docdir)/keybase/*.sh
 
 uninstall-local:
-       for f in $(SAMPLES) ; do \
-               rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
+       for f in $(SAMPLES); do \
+               rm -f $(DESTDIR)$(docdir)/samples/$$f; \
        done
-       for d in $(CONTRIB_DIRS); do                                            \
-               rm -fr $(DESTDIR)$(docdir)/$$d;                                 \
+       for d in $(CONTRIB_DIRS); do \
+               rm -fr $(DESTDIR)$(docdir)/$$d; \
        done
        -rm -rf $(DESTDIR)$(docdir)/samples/iconv
        -rmdir $(DESTDIR)$(docdir)/samples
@@ -51,8 +41,8 @@ uninstall-local:
 
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist-hook: Makefile $(DISTFILES)
-       mkdir -p $(distdir)/iconv
-       for file in $(srcdir)/iconv/*.rc ; do                                   \
-               ln $$file $(distdir)/iconv 2> /dev/null                         \
-                       || cp -p $$file $(distdir)/iconv ;                      \
+       $(MKDIR_P) $(distdir)/iconv
+       for file in $(srcdir)/iconv/*.rc; do \
+               ln $$file $(distdir)/iconv 2> /dev/null \
+                       || cp -p $$file $(distdir)/iconv; \
        done

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7b492aca36fbb89307318c86e96b1d2c35224eda..6a6c711b4dd68dfe94c19870814240a0a39edcc7 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,27 +12,15 @@ MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C
 
 noinst_PROGRAMS = makedoc
 
-EXTRA_DIST = \
-       mutt.man                        \
-       PGP-Notes.txt                   \
-       gen-map-doc                     \
-       muttrc.man.head                 \
-       muttrc.man.tail                 \
-       mbox.5                  \
-       mmdf.5                  \
-       manual.xml.head                 \
-       manual.xml.tail                 \
-       smime-notes.txt                 \
-       Muttrc Muttrc.head \
-       makedoc.c makedoc_defs.h        \
-       mutt.css mutt.xsl html.xsl chunk.xsl \
-       $(BUILT_DISTFILES) neomutt-syntax.vim \
-       mutt-1.7.0-syntax.vim \
-       pgpewrap.1 pgpring.1 smime_keys.1
-
-CHUNKED_DOCFILES = intro.html gettingstarted.html \
-       configuration.html mimesupport.html advancedusage.html \
-       optionalfeatures.html security.html tuning.html reference.html miscellany.html
+EXTRA_DIST = $(BUILT_DISTFILES) chunk.xsl gen-map-doc html.xsl makedoc.c \
+       makedoc_defs.h manual.xml.head manual.xml.tail mbox.5 mmdf.5 \
+       mutt-1.7.0-syntax.vim mutt.css mutt.man mutt.xsl Muttrc Muttrc.head \
+       muttrc.man.head muttrc.man.tail neomutt-syntax.vim PGP-Notes.txt \
+       smime-notes.txt pgpewrap.1 pgpring.1 smime_keys.1
+
+CHUNKED_DOCFILES = advancedusage.html configuration.html gettingstarted.html \
+       intro.html mimesupport.html miscellany.html optionalfeatures.html \
+       reference.html security.html tuning.html
 
 HTML_DOCFILES = manual.html index.html $(CHUNKED_DOCFILES)
 
@@ -40,12 +28,13 @@ BUILT_DISTFILES = manual.txt $(HTML_DOCFILES)
 
 srcdir_DOCFILES = PGP-Notes.txt smime-notes.txt
 
-topsrcdir_DOCFILES = CODE_OF_CONDUCT.md COPYRIGHT LICENSE.md INSTALL \
-       ChangeLog.md README.SSL README.md
+topsrcdir_DOCFILES = ChangeLog.md CODE_OF_CONDUCT.md COPYRIGHT INSTALL \
+       LICENSE.md README.md README.SSL
 
 all: makedoc-all
 
-makedoc-all: mutt.1 muttrc.man manual.html Muttrc index.html $(CHUNKED_DOCFILES) manual.txt neomutt-syntax.vim
+makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt mutt.1 \
+       Muttrc muttrc.man neomutt-syntax.vim
 
 install-data-local: makedoc-all
        $(MKDIR_P) $(DESTDIR)$(mandir)/man1
@@ -59,43 +48,42 @@ install-data-local: makedoc-all
        $(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5
        $(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5
        $(MKDIR_P) $(DESTDIR)$(docdir)
-       for f in $(topsrcdir_DOCFILES) ; do \
-               $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+       for f in $(topsrcdir_DOCFILES); do \
+               $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir); \
        done
-       for f in $(srcdir_DOCFILES) ; do \
-               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+       for f in $(srcdir_DOCFILES); do \
+               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \
        done
        -$(INSTALL) -m 644 $(srcdir)/manual.txt $(DESTDIR)$(docdir)
-       -for f in $(HTML_DOCFILES) ; do \
-               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+       -for f in $(HTML_DOCFILES); do \
+               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \
        done
        $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
-       -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
-               mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
-       elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
-               mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
-       elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
-               $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
+       -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ]; then \
+               mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir); \
+       elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ]; then \
+               mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir); \
+       elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ]; then \
+               $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir); \
        fi
        -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
 
 uninstall-local:
        for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-               rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
+               rm -f $(DESTDIR)$(mandir)/man1/$$f; \
        done
-       for f in muttrc.5 mbox.5 mmdf.5 ; do \
-               rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
+       for f in muttrc.5 mbox.5 mmdf.5; do \
+               rm -f $(DESTDIR)$(mandir)/man5/$$f; \
        done
-       for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); \
-       do \
-               rm -f $(DESTDIR)$(docdir)/$$f ; \
+       for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \
+               rm -f $(DESTDIR)$(docdir)/$$f; \
        done
        -rm -f $(DESTDIR)$(docdir)/manual.txt
-       for i in Muttrc ; do \
-         if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \
-               rm $(DESTDIR)$(sysconfdir)/$$i ; \
-         fi ; \
-         rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \
+       for i in Muttrc; do \
+               if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i; then \
+                       rm $(DESTDIR)$(sysconfdir)/$$i; \
+               fi; \
+               rm $(DESTDIR)$(sysconfdir)/$${i}.dist; \
        done
        rm -f $(DESTDIR)$(docdir)/neomutt-syntax.vim
 
@@ -132,10 +120,9 @@ sortcheck: manual.xml
        rm -rf vars.tmp.1 vars.tmp.2
 
 clean-local:
-       rm -f *~ *.html *.orig *.rej  *.ps mutt.1 muttrc.man
-       rm -f *.aux *.log *.tex *.out
+       rm -f *.html mutt.1 muttrc.man
 
-DISTCLEANFILES=manual.txt manual.html manual.xml Muttrc
+DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc
 
 muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
        $(MAKEDOC_CPP) $(top_srcdir)/init.h | \
@@ -150,8 +137,8 @@ mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
 
 manual.xml: makedoc$(EXEEXT) ../config.h $(top_srcdir)/init.h \
-               manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
-               $(srcdir)/gen-map-doc
+       manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
+       $(srcdir)/gen-map-doc
        ( mutt_ver=`sed -n -e '/MUTT_VERSION/s/.*"\(.*\)".*/\1/p' ../config.h` && \
                sed -e "s/@VERSION\@/$(PACKAGE_VERSION) ($$mutt_ver)/" $(srcdir)/manual.xml.head && \
                $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3a71e384fb9bbb4c7197e6a882df016a7e41e917..ee703ae5552a8ecbd06690bfdbeb90c8efd55969 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = gettext.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 README
 
 dist-hook:
-       for i in $(srcdir)/*.m4 ; do \
-               cp -f -p $$i $(distdir) ; \
+       for i in $(srcdir)/*.m4; do \
+               cp -f -p $$i $(distdir); \
        done