X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f7919e77bcc861e64c769363649d757c792e9d69..10c5b65eb8fefdf84cdb631edcd18160effcdf7e:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 4886e96e..1ae131eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,9 +55,11 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/bad-input/test-header \
 	test/burst/test-burst test/burst/test-burst-mime \
 	test/comp/test-comp-format test/dist/test-dist \
+	test/folder/test-coverage \
 	test/folder/test-create test/folder/test-nocreate \
 	test/folder/test-packf test/folder/test-recurse \
 	test/folder/test-sortm test/folder/test-total \
+	test/format/test-ap \
 	test/format/test-curses test/format/test-dp \
 	test/format/test-fmtdump test/format/test-functions \
 	test/format/test-localmbox test/format/test-myname \
@@ -65,6 +67,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/format/test-nullstr \
 	test/format/test-rightjustify \
 	test/format/test-unquote \
+	test/forw/test-forw-coverage \
 	test/forw/test-forw-digest test/forw/test-forw-format \
 	test/inc/test-deb359167 test/inc/test-eom-align \
 	test/inc/test-inc-scanout test/inc/test-msgchk \
@@ -72,7 +75,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/install-mh/test-install-mh test/install-mh/test-version-check \
 	test/locking/test-datalocking test/locking/test-spoollocking \
 	test/manpages/test-manpages \
-	test/mhbuild/test-attach \
+	test/mhbuild/test-attach test/mhbuild/test-mhbuild \
 	test/mhbuild/test-cte \
 	test/mhbuild/test-ext-params \
 	test/mhbuild/test-forw test/mhbuild/test-header-encode \
@@ -133,9 +136,9 @@ AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
 ## Stuff that should be cleaned via "make clean"
 ## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
 ##
-CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c etc/mts.conf \
-	     etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \
-	     *.plist
+CLEANFILES = config/version.c sbr/dtimep.c \
+	     etc/bash_completion_nmh etc/mhn.defaults etc/mts.conf \
+	     man/man.sed man/mh-chart.man $(man_MANS) *.plist
 clean-local:
 	@rm -rf RPM a.out.dSYM uip/a.out.dSYM
 	@rm -rf test/testdir
@@ -207,7 +210,7 @@ dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \
 		   etc/mhl.body etc/mhl.digest etc/mhl.format etc/mhl.forward \
 		   etc/mhl.headers etc/mhl.reply etc/mhl.replywithoutbody \
 		   etc/mhshow.marker etc/rcvdistcomps etc/rcvdistcomps.outbox \
-		   etc/replcomps etc/replgroupcomps \
+		   etc/replcomps etc/replgroupcomps etc/rmmproc.messageid \
 		   etc/scan.MMDDYY \
 		   etc/scan.YYYYMMDD etc/scan.curses etc/scan.default \
 		   etc/scan.highlighted \
@@ -218,14 +221,14 @@ dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \
 ## The same as above, but we don't include these in the distribution
 ## (because they're generated at compile time)
 ##
-nmhetc_DATA = etc/mhn.defaults etc/mts.conf
+nmhetc_DATA = etc/bash_completion_nmh etc/mhn.defaults etc/mts.conf
 
 ##
 ## Documentation that gets installed in docdir
 ##
 dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
-		docs/COMPLETION-BASH docs/COMPLETION-TCSH \
-		docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \
+		docs/COMPLETION-TCSH docs/COMPLETION-ZSH \
+		docs/DIFFERENCES docs/FAQ \
 		docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
 		docs/README-HOOKS docs/README-components docs/README.about \
 		docs/README.SASL docs/README.developers docs/README.manpages \
@@ -286,7 +289,8 @@ man_SRCS = man/MH.man man/ali.man man/anno.man man/ap.man man/burst.man  \
 ## Automake using the automatic rules
 ##
 EXTRA_DIST = autogen.sh build_nmh config/version.sh sbr/icalparse.h \
-	     etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \
+	     etc/bash_completion_nmh-gen etc/mhn.defaults.sh etc/mts.conf.in \
+	     etc/sendfiles \
 	     $(MHNSEARCHPROG) DATE MACHINES \
 	     docs/ChangeLog_MH-3_to_MH-6.6 \
 	     docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
@@ -514,11 +518,15 @@ test_getcwidth_LDADD = $(POSTLINK)
 config/version.c: Makefile $(srcdir)/config/version.sh
 	env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
+etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
+	$(MKDIR_P) $(@D) # FIXME: A better way?
+	$(srcdir)/etc/bash_completion_nmh-gen > $@
+
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 	@rm -f $@
 	$(SED) -e 's,%mts%,$(MTS),' \
 	       -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%smtpservers%,$(smtpservers),' \
+	       -e 's,%smtpserver%,$(smtpserver),' \
 	       -e 's,%default_locking%,$(default_locking),' \
 	       -e 's,%supported_locks%,$(supported_locks),' \
 				< $(srcdir)/etc/mts.conf.in > $@
@@ -579,7 +587,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/closefds.c sbr/concat.c sbr/context_del.c \
 		      sbr/context_find.c sbr/context_foil.c sbr/context_read.c \
 		      sbr/context_replace.c sbr/context_save.c \
-		      sbr/copy.c sbr/copyip.c sbr/cpydata.c \
+		      sbr/copyip.c sbr/cpydata.c \
 		      sbr/cpydgst.c sbr/crawl_folders.c sbr/credentials.c \
 		      sbr/discard.c sbr/done.c sbr/dtimep.l sbr/dtime.c \
 		      sbr/encode_rfc2047.c \