I guess the -i option to sed works differently on Linux and MacOS

[mmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 08fee7c..8abe7ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,16 +40,27 @@ 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/post/test-post-basic test/post/test-post-multiple \
+       test/post/test-post-dcc test/post/test-post-fcc \
+       test/post/test-post-multifrom test/post/test-post-envelope \
+       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 \
@@ -57,7 +68,7 @@ TESTS = test/bad-input/test-header test/comp/test-comp-format \
        test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
-check_PROGRAMS = test/getfullname
+check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp
 
 ##
 ## Stuff that should be cleaned via "make clean"
@@ -151,8 +162,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
@@ -198,7 +210,8 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
             man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
             man/unseen.man man/whatnow.man man/whom.man test/README $(TESTS) \
             test/inc/deb359167.mbox test/inc/fromline.txt \
-            test/inc/msgheader.txt test/inc/filler.txt test/inc/md5sums
+            test/inc/msgheader.txt test/inc/filler.txt test/inc/md5sums \
+            test/post/test-post-common.sh
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -217,7 +230,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
 
@@ -353,6 +367,12 @@ uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
 test_getfullname_SOURCES = test/getfullname.c
 test_getfullname_LDADD =
 
+test_getfqdn_SOURCES = test/getfqdn.c
+test_getfqdn_LDADD =
+
+test_fakesmtp_SOURCES = test/fakesmtp.c
+test_fakesmtp_LDADD =
+
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
@@ -493,12 +513,6 @@ man/man.sed: Makefile
        @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' >> $@
@@ -550,23 +564,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
 
 
 ##