X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/08b13bc1cb693451c1e9f50f770acaddf42ed9da..939dea68806ab22c29755091b16236b48876442f:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 92d9dde3..4886e96e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/mhlist/test-mhlist test/mhlist/test-ext-params \
 	test/mhmail/test-mhmail \
 	test/mhparam/test-mhparam test/mhpath/test-mhpath \
+	test/mhshow/test-binary \
 	test/mhshow/test-charset test/mhshow/test-textcharset \
 	test/mhshow/test-cte-binary test/mhshow/test-qp \
 	test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \
@@ -112,7 +113,6 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/cleanup ## The "cleanup" test should always be last.
 
 XFAIL_TESTS = \
-    test/scan/test-header-parsing \
     #
 
 check_SCRIPTS = test/common.sh
@@ -134,7 +134,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
 ## 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 \
-	     sbr/ctype-checked.[hc] \
 	     etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \
 	     *.plist
 clean-local:
@@ -157,11 +156,6 @@ superclean: maintainer-clean
 	@rm -f $(SUPERCLEANFILES)
 .PHONY: superclean
 
-##
-## Files that need to be built before everything else
-##
-BUILT_SOURCES = sbr/ctype-checked.c
-
 ##
 ## This is a list of all programs that get installed in the "bin" directory
 ## Note that primary difference between "PROGRAMS" and "SCRIPTS" is that
@@ -241,7 +235,7 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
 ## Contribs that get installed in docdir/contrib/
 ##
 docs_contribdir = $(docdir)/contrib
-dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \
+dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter \
 			    docs/contrib/localpostproc docs/contrib/ml \
 			    docs/contrib/vpick docs/contrib/replaliases
 dist_docs_contrib_DATA = docs/contrib/replaliases
@@ -291,7 +285,7 @@ man_SRCS = man/MH.man man/ali.man man/anno.man man/ap.man man/burst.man  \
 ## Files we need to include in the distribution which aren't found by
 ## Automake using the automatic rules
 ##
-EXTRA_DIST = autogen.sh config/version.sh sbr/icalparse.h \
+EXTRA_DIST = autogen.sh build_nmh config/version.sh sbr/icalparse.h \
 	     etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \
 	     $(MHNSEARCHPROG) DATE MACHINES \
 	     docs/ChangeLog_MH-3_to_MH-6.6 \
@@ -608,7 +602,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/makedir.c sbr/md5.c sbr/message_id.c \
 		      sbr/mime_type.c sbr/mts.c sbr/netsec.c \
 		      sbr/norm_charmap.c sbr/path.c \
-		      sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \
+		      sbr/pidwait.c sbr/pidstatus.c \
 		      sbr/print_help.c sbr/print_sw.c sbr/print_version.c \
 		      sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \
 		      sbr/r1bindex.c sbr/readconfig.c sbr/ruserpass.c \
@@ -729,13 +723,17 @@ rpm: dist
 ## These targets are not integrated into the other automake
 ## targets because they will be used so infrequently, if at all.
 ##
-gcov:
+gcov: gcov-rebuild gcov-run gcov-process gcov-report
+gcov-rebuild:
 	@echo rebuilding with AM_CFLAGS=--coverage . . .
-	@(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null  && \
-	  make check AM_CFLAGS=--coverage
+	@(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null
+gcov-run:
+	make check AM_CFLAGS=--coverage
+gcov-process:
 	@for i in `find . -name '*.gcda'`; do \
-	   gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
+	   gcov -pro `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
 	 done
+gcov-report:
 	@for i in `find . -name '*.gcno'`; do \
 	   if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \
 	     echo untested: $$i; \
@@ -745,7 +743,8 @@ gcov-mostlyclean:
 	@find . -name '*.gcno' -o -name '*.gcda' | xargs rm
 gcov-clean: gcov-mostlyclean
 	@find . -name '*.gcov' | xargs rm
-.PHONY: gcov gcov-mostlyclean gcov-clean
+.PHONY: gcov gcov-rebuild gcov-run gcov-process gcov-report \
+    gcov-mostlyclean gcov-clean
 
 
 ##