From: Richard Russon <rich@flatcap.org>
Date: Fri, 20 Jul 2018 22:12:26 +0000 (+0100)
Subject: tidy makefiles
X-Git-Tag: 2019-10-25~743^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=362bd2605e1b64fc284292a74b8a02b1fe406662;p=neomutt

tidy makefiles
---

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 8699c51b3..e03cbaa2f 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -61,18 +61,18 @@ ALL_FILES!=	(cd $(SRCDIR) && git ls-files 2>/dev/null) || true
 ###############################################################################
 # neomutt
 NEOMUTT=	neomutt$(EXEEXT)
-NEOMUTTOBJS=	addrbook.o alias.o bcache.o browser.o buffy.o \
-		color.o commands.o complete.o compose.o compress.o \
-		conststrings.o copy.o curs_lib.o curs_main.o edit.o editmsg.o \
-		enriched.o enter.o filter.o flags.o group.o handler.o \
-		hdrline.o help.o hook.o init.o keymap.o \
-		main.o menu.o muttlib.o mutt_account.o mutt_attach.o mutt_body.o mutt_header.o \
-		mutt_history.o mutt_logging.o mutt_parse.o mutt_signal.o mutt_socket.o mutt_thread.o mutt_url.o mutt_window.o mx.o \
-		pager.o pattern.o \
-		postpone.o progress.o query.o recvattach.o recvcmd.o resize.o rfc1524.o \
-		rfc3676.o safe_asprintf.o score.o send.o \
-		sendlib.o sidebar.o smtp.o sort.o state.o status.o system.o \
-		terminal.o version.o
+NEOMUTTOBJS=	addrbook.o alias.o bcache.o browser.o buffy.o color.o \
+		commands.o complete.o compose.o compress.o conststrings.o \
+		copy.o curs_lib.o curs_main.o edit.o editmsg.o enriched.o \
+		enter.o filter.o flags.o group.o handler.o hdrline.o help.o \
+		hook.o init.o keymap.o main.o menu.o muttlib.o mutt_account.o \
+		mutt_attach.o mutt_body.o mutt_header.o mutt_history.o \
+		mutt_logging.o mutt_parse.o mutt_signal.o mutt_socket.o \
+		mutt_thread.o mutt_url.o mutt_window.o mx.o pager.o pattern.o \
+		postpone.o progress.o query.o recvattach.o recvcmd.o resize.o \
+		rfc1524.o rfc3676.o safe_asprintf.o score.o send.o sendlib.o \
+		sidebar.o smtp.o sort.o state.o status.o system.o terminal.o \
+		version.o
 
 @if !HAVE_WCSCASECMP
 NEOMUTTOBJS+=	wcscasecmp.o
@@ -89,9 +89,10 @@ ALLOBJS+=	$(NEOMUTTOBJS)
 ###############################################################################
 # libemail
 LIBEMAIL=	libemail.a
-LIBEMAILOBJS=	email/address.o email/attach.o email/body.o email/envelope.o \
-		email/from.o email/email_globals.o email/header.o email/idna.o \
-		email/mime.o email/parameter.o email/parse.o email/rfc2047.o email/rfc2231.o email/tags.o \
+LIBEMAILOBJS=	email/address.o email/attach.o email/body.o \
+		email/email_globals.o email/envelope.o email/from.o \
+		email/header.o email/idna.o email/mime.o email/parameter.o \
+		email/parse.o email/rfc2047.o email/rfc2231.o email/tags.o \
 		email/thread.o email/url.o
 CLEANFILES+=	$(LIBEMAIL) $(LIBEMAILOBJS)
 MUTTLIBS+=	$(LIBEMAIL)
@@ -143,10 +144,10 @@ ALLOBJS+=	$(LIBMAILDIROBJS)
 # libmutt
 LIBMUTT=	libmutt.a
 LIBMUTTOBJS=	mutt/base64.o mutt/buffer.o mutt/charset.o mutt/date.o \
-		mutt/envlist.o mutt/exit.o mutt/file.o mutt/hash.o mutt/history.o \
-		mutt/list.o mutt/logging.o mutt/mapping.o \
-		mutt/mbyte.o mutt/md5.o mutt/memory.o mutt/regex.o \
-		mutt/sha1.o mutt/signal.o mutt/string.o
+		mutt/envlist.o mutt/exit.o mutt/file.o mutt/hash.o \
+		mutt/history.o mutt/list.o mutt/logging.o mutt/mapping.o \
+		mutt/mbyte.o mutt/md5.o mutt/memory.o mutt/regex.o mutt/sha1.o \
+		mutt/signal.o mutt/string.o
 CLEANFILES+=	$(LIBMUTT) $(LIBMUTTOBJS)
 MUTTLIBS+=	$(LIBMUTT)
 ALLOBJS+=	$(LIBMUTTOBJS)
@@ -400,9 +401,9 @@ uninstall: $(UNINSTALL_TARGETS)
 
 # distclean
 distclean: clean
-	$(RM) $(DEPFILES) conststrings.c config.h config.log doc/neomutt.1 \
-		Makefile po/Makefile contrib/Makefile doc/Makefile \
-		test/Makefile autosetup/jimsh0 .clang_complete
+	$(RM) $(DEPFILES) .clang_complete autosetup/jimsh0 config.h config.log \
+		conststrings.c contrib/Makefile doc/Makefile doc/neomutt.1 \
+		html Makefile po/Makefile test/Makefile
 
 ##############################################################################
 # include generated dependency files
diff --git a/contrib/Makefile.autosetup b/contrib/Makefile.autosetup
index ec94ec462..faf4f025e 100644
--- a/contrib/Makefile.autosetup
+++ b/contrib/Makefile.autosetup
@@ -1,6 +1,6 @@
 SAMPLES=	colors.default colors.linux gpg.rc Mush.rc Pine.rc \
-		sample.mailcap sample.neomuttrc \
-		sample.neomuttrc-tlr smime.rc smime_keys_test.pl Tin.rc
+		sample.mailcap sample.neomuttrc sample.neomuttrc-tlr smime.rc \
+		smime_keys_test.pl Tin.rc
 
 CONTRIB_DIRS=	colorschemes hcache-bench keybase logo lua vim-keys