X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=c87160c00c9db888f1a35be706285b699324fef6;hb=8a87f7b5fd5622dcde0fc4b48d93157616b496f0;hp=c8b75879b3a646d9251493cc060b023bc24abebb;hpb=ffa47b9363c0abd2ba809445f52e622a15f8d13c;p=mmh

diff --git a/Makefile.am b/Makefile.am
index c8b7587..c87160c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,16 +40,24 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
 ##
 ## Important note: the "cleanup" test should always be last
 ##
-TESTS = test/bad-input/test-header test/comp/test-comp-format \
+TESTS = test/bad-input/test-header \
+	test/burst/test-burst \
+	test/comp/test-comp-format \
 	test/folder/test-create \
 	test/folder/test-total test/format/test-localmbox \
 	test/format/test-myname test/format/test-myhost \
 	test/format/test-mymbox \
+	test/forw/test-forw-digest \
+	test/forw/test-forw-format \
 	test/inc/test-deb359167 test/inc/test-eom-align \
 	test/manpages/test-manpages test/mhbuild/test-forw \
+	test/mhlist/test-mhlist test/mhparam/test-mhparam \
 	test/mhpath/test-mhpath \
 	test/mhshow/test-cte-binary test/mhshow/test-qp \
-	test/mhshow/test-subpart test/new/test-basic test/pick/test-stderr \
+	test/mhshow/test-subpart test/mhstore/test-mhstore \
+	test/new/test-basic \
+	test/pick/test-pick test/pick/test-stderr \
+	test/refile/test-refile \
 	test/repl/test-if-str test/scan/test-scan \
 	test/sequences/test-flist test/sequences/test-mark \
 	test/whatnow/test-attach-detach test/whatnow/test-cd \
@@ -151,8 +159,9 @@ sysconf_DATA = etc/mhn.defaults etc/mts.conf
 dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \
 		docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \
 		docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
-		docs/README-HOOKS docs/README.about docs/README.SASL \
-		docs/README.developers docs/README.manpages docs/TODO
+		docs/README-HOOKS docs/README-components docs/README.about \
+		docs/README.SASL docs/README.developers docs/README.manpages \
+		docs/TODO
 
 ##
 ## Our man pages
@@ -217,7 +226,8 @@ uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 uip_comp_LDADD = $(LDADD) $(ICONVLIB)
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
-		   uip/annosbr.c uip/distsbr.c
+		   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
+uip_dist_LDADD = $(LDADD) $(ICONVLIB)
 
 uip_flist_SOURCES = uip/flist.c
 
@@ -479,41 +489,35 @@ manext8 = 8
 $(man_MANS): man/man.sed
 
 man/man.sed: Makefile
-	echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
-	echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
-	echo 's,%nmhdate%,$(DATE),g' >> $@
-	echo 's,%bindir%,$(bindir),g' >> $@
-	echo 's,%etcdir%,$(sysconfdir),g' >> $@
-	echo 's,%libdir%,$(libdir),g' >> $@
-	echo 's,%mandir%,$(mandir),g' >> $@
-	echo 's,%mailspool%,$(mailspool),g' >> $@
-	echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-	echo 's,%default_editor%,$(editorpath),g' >> $@
-	echo 's,%default_pager%,$(pagerpath),g' >> $@
-	echo 's,%manext1%,$(manext1),g' >> $@
-	echo 's,%manext5%,$(manext5),g' >> $@
-	echo 's,%manext8%,$(manext8),g' >> $@
-	echo '/%components%/r $(top_srcdir)/etc/components' >> $@
-	echo ' s,%components%,,g' >> $@
-	echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
-	echo ' s,%distcomps%,,g' >> $@
-	echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@
-	echo ' s,%forwcomps%,,g' >> $@
-	echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@
-	echo ' s,%mhl_forward%,,g' >> $@
-	echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@
-	echo ' s,%mhl_format%,,g' >> $@
-	echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
-	echo ' s,%mhl_reply%,,g' >> $@
+	@echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
+	@echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
+	@echo 's,%nmhdate%,$(DATE),g' >> $@
+	@echo 's,%bindir%,$(bindir),g' >> $@
+	@echo 's,%etcdir%,$(sysconfdir),g' >> $@
+	@echo 's,%libdir%,$(libdir),g' >> $@
+	@echo 's,%mandir%,$(mandir),g' >> $@
+	@echo 's,%mailspool%,$(mailspool),g' >> $@
+	@echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
+	@echo 's,%default_editor%,$(editorpath),g' >> $@
+	@echo 's,%default_pager%,$(pagerpath),g' >> $@
+	@echo 's,%manext1%,$(manext1),g' >> $@
+	@echo 's,%manext5%,$(manext5),g' >> $@
+	@echo 's,%manext8%,$(manext8),g' >> $@
+	@echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@
+	@echo ' s,%mhl_forward%,,g' >> $@
+	@echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@
+	@echo ' s,%mhl_format%,,g' >> $@
+	@echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
+	@echo ' s,%mhl_reply%,,g' >> $@
 
 .man.$(manext1):
-	$(SED) -f man/man.sed $< > $@
+	@$(SED) -f man/man.sed $< > $@
 
 .man.$(manext5):
-	$(SED) -f man/man.sed $< > $@
+	@$(SED) -f man/man.sed $< > $@
 
 .man.$(manext8):
-	$(SED) -f man/man.sed $< > $@
+	@$(SED) -f man/man.sed $< > $@
 
 ## Don't include commit hashes in ChangeLog.
 ChangeLog:
@@ -550,23 +554,25 @@ cscope:
 
 ##
 ## Use GNU gcov to find the coverage of the test suite.
-## gcov and gcov-clean are not integrated into the other automake
-## targets because gcov will be used so infrequently, if at all.
+## These targets are not integrated into the other automake
+## targets because they will be used so infrequently, if at all.
 ##
 gcov:
 	@echo rebuilding with AM_CLFAGS=--coverage . . .
 	@(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null  &&  make check
 	@for i in `find . -name '*.gcda'`; do \
-	   gcov -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
+	   gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
 	 done
 	@for i in `find . -name '*.gcno'`; do \
 	   if ! test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then \
 	     echo untested: $$i; \
 	   fi; \
 	 done
-gcov-clean:
-	@find . -name '*.gcno' -o -name '*.gcda' -o -name '*.gcov' | xargs rm
-.PHONY: gcov gcov-clean
+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
 
 
 ##