Removed a bunch of unreachable break statements found by

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1f87ac26850ed0d402805acd2b2d4b36335547f8..bb3fc20cfd2275ee1e4dea57a9ee6805b32a1842 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,10 +63,12 @@ TESTS = test/ali/test-ali test/anno/test-anno \
        test/install-mh/test-install-mh \
        test/locking/test-datalocking test/locking/test-spoollocking \
        test/manpages/test-manpages \
-       test/mhbuild/test-forw test/mhbuild/test-utf8-body \
+       test/mhbuild/test-forw test/mhbuild/test-header-encode \
+       test/mhbuild/test-utf8-body \
        test/mhfixmsg/test-mhfixmsg \
        test/mhlist/test-mhlist test/mhmail/test-mhmail \
        test/mhparam/test-mhparam test/mhpath/test-mhpath \
+       test/mhshow/test-charset \
        test/mhshow/test-cte-binary test/mhshow/test-qp \
        test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \
        test/mhstore/test-mhstore test/new/test-basic \
@@ -90,7 +92,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
        test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
-check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp \
+check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
                 test/getcwidth
 DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
@@ -425,8 +427,8 @@ uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
 test_getfullname_SOURCES = test/getfullname.c
 test_getfullname_LDADD = sbr/libmh.a
 
-test_getfqdn_SOURCES = test/getfqdn.c
-test_getfqdn_LDADD =
+test_getcanon_SOURCES = test/getcanon.c
+test_getcanon_LDADD =
 
 test_fakepop_SOURCES = test/fakepop.c
 test_fakepop_LDADD =
@@ -547,8 +549,9 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
                      sbr/seq_setcur.c sbr/seq_setprev.c sbr/seq_setunseen.c \
                      sbr/showfile.c sbr/signals.c sbr/smatch.c \
                      sbr/snprintb.c sbr/ssequal.c \
-                     sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \
-                     sbr/fmt_def.c sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
+                     sbr/strindex.c sbr/trimcpy.c sbr/unquote.c \
+                     sbr/uprf.c sbr/vfgets.c \
+                     sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
                      sbr/m_mktemp.c sbr/getansreadline.c sbr/vector.c \
                      config/config.c config/version.c
 
@@ -581,6 +584,7 @@ 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,%bindir%,$(bindir),g' >> $@
+       @echo 's,%docdir%,$(docdir),g' >> $@
        @echo 's,%etcdir%,$(sysconfdir),g' >> $@
        @echo 's,%libdir%,$(libdir),g' >> $@
        @echo 's,%mandir%,$(mandir),g' >> $@