]> diplodocus.org Git - nmh/blobdiff - Makefile.am
Fixed strip_crs() in mhfixmsg to work even if it's the
[nmh] / Makefile.am
index 387c31cc87a95b519469f32d8eeea7d1456bf1b5..78cce559d46bf13ed64fb3472309c2fbe558f941 100644 (file)
@@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I m4
 ## LDADD is included in the program-specific LDADD since we want to add
 ## to this list of libraries, not replace it.
 ##
-LDADD = sbr/libmh.a sbr/libdtimep.a
+LDADD = sbr/libmh.a
 
 ##
 ## These are used to create the default mhn.defaults config file
@@ -37,54 +37,67 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
                    MH_TEST_DIR="@abs_builddir@/test/testdir" \
                    auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
                    mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
+                   supported_locks="$(supported_locks)" \
                    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
+                   ICONV_ENABLED=$(ICONV_ENABLED) \
                    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
 ##
 ## Important note: the "cleanup" test should always be last
 ##
-TESTS = test/ali/test-ali \
+TESTS = test/ali/test-ali test/anno/test-anno \
        test/bad-input/test-header \
-       test/burst/test-burst \
-       test/comp/test-comp-format \
+       test/burst/test-burst test/burst/test-burst-mime \
+       test/comp/test-comp-format test/dist/test-dist \
        test/folder/test-create test/folder/test-packf \
-       test/folder/test-sortm test/folder/test-total \
+       test/folder/test-recurse test/folder/test-sortm \
+       test/folder/test-total \
        test/format/test-dp test/format/test-fmtdump \
        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/format/test-rightjustify \
+       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/install-mh/test-install-mh \
-       test/manpages/test-manpages test/mhbuild/test-forw \
+       test/inc/test-inc-scanout test/inc/test-msgchk \
+       test/inc/test-pop \
+       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/mhfixmsg/test-mhfixmsg \
        test/mhlist/test-mhlist test/mhmail/test-mhmail \
        test/mhparam/test-mhparam test/mhpath/test-mhpath \
        test/mhshow/test-cte-binary test/mhshow/test-qp \
-       test/mhshow/test-subpart test/mhstore/test-mhstore \
-       test/new/test-basic \
+       test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \
+       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-aliases test/post/test-post-basic \
+       test/post/test-post-multiple test/post/test-post-bcc \
        test/post/test-post-dcc test/post/test-post-fcc \
        test/post/test-post-multifrom test/post/test-post-envelope \
-       test/post/test-post-group test/post/test-mts \
-       test/prompter/test-prompter \
+       test/post/test-post-group test/post/test-mts test/post/test-messageid \
+       test/post/test-sendfiles test/prompter/test-prompter \
        test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
-       test/refile/test-refile \
+       test/rcv/test-rcvtty test/refile/test-refile \
        test/repl/test-if-str test/repl/test-trailing-newline \
        test/repl/test-multicomp test/repl/test-repl \
        test/scan/test-scan test/scan/test-scan-multibyte \
        test/sequences/test-flist test/sequences/test-mark \
+       test/sequences/test-out-of-range \
+       test/slocal/test-slocal \
        test/whatnow/test-attach-detach test/whatnow/test-cd \
        test/whatnow/test-ls test/whom/test-whom \
        test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
-check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp
+check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp \
+                test/getcwidth
 DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
 ## Stuff that should be cleaned via "make clean"
 ##
-CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
+CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf \
+            etc/gen-ctype-checked sbr/ctype-checked.h sbr/ctype-checked.c \
             etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
 clean-local:
        @rm -rf RPM a.out.dSYM uip/a.out.dSYM
@@ -93,7 +106,7 @@ clean-local:
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
 ##
-MAINTAINERCLEANFILES = cscope.files cscope.out
+MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out
 
 ##
 ## And our own superclean, to get everything left by maintainer-clean.
@@ -108,7 +121,7 @@ superclean: maintainer-clean
 ##
 ## Files that need to be built before everything else
 ##
-BUILT_SOURCES = sbr/sigmsg.h
+BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c
 
 ##
 ## This is a list of all programs that get installed in the "bin" directory
@@ -116,12 +129,12 @@ BUILT_SOURCES = sbr/sigmsg.h
 ## the latter do not have $(EXEEXT) added on the end.
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
-              uip/folder uip/forw uip/inc uip/install-mh uip/mark \
-              uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
-              uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
-              uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
-              uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
-              uip/whom
+              uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \
+              uip/mark uip/mhbuild uip/mhfixmsg uip/mhlist uip/mhn \
+              uip/mhparam uip/mhpath uip/mhshow uip/mhstore uip/msgchk \
+              uip/msh uip/new uip/packf uip/pick uip/prompter uip/refile \
+              uip/repl uip/rmf uip/rmm uip/scan uip/send uip/show uip/sortm \
+              uip/whatnow uip/whom
 
 bin_SCRIPTS = uip/mhmail etc/sendfiles
 
@@ -130,13 +143,22 @@ bin_SCRIPTS = uip/mhmail etc/sendfiles
 ##
 auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
                   uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \
-                  uip/spost uip/viamail uip/mhtest
+                  uip/viamail uip/mhtest
+
+auxexec_SCRIPTS = uip/spost
+
+##
+## Programs that MAY need to get built at some point; we need to list them
+## here if they don't appear in any other primary so Automake knows about
+## them and can properly record dependency information.
+##
+EXTRA_PROGRAMS = etc/gen-ctype-checked
 
 ##
 ## Internal libraries that we create as part of the build process
 ## but do not install
 ##
-noinst_LIBRARIES = sbr/libmh.a sbr/libdtimep.a mts/libmts.a
+noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
 
 ##
 ## These are all of our header files.  Right now we don't install any of
@@ -147,7 +169,7 @@ noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
                 h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \
                 h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
                 h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
-                h/vmhsbr.h mts/smtp/smtp.h
+                h/vmhsbr.h mts/smtp/smtp.h sbr/ctype-checked.h
 
 ##
 ## Extra files we need to install in various places
@@ -157,8 +179,8 @@ dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \
                    etc/mhl.format etc/mhl.forward etc/mhl.headers \
                    etc/mhl.reply etc/rcvdistcomps etc/rcvdistcomps.outbox \
                    etc/replcomps etc/replgroupcomps etc/scan.MMDDYY \
-                   etc/scan.YYYYMMDD etc/scan.default etc/scan.mailx \
-                   etc/scan.nomime etc/scan.size etc/scan.time \
+                   etc/scan.YYYYMMDD etc/scan.default etc/scan.highlighted \
+                   etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \
                    etc/scan.timely etc/scan.unseen
 
 ##
@@ -182,20 +204,21 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
 ## Contribs that get installed in docdir/contrib/
 ##
 contribdir = $(docdir)/contrib
-dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh
+dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \
+                   docs/contrib/ml docs/contrib/vpick
 
 ##
 ## Our man pages
 ##
 man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
           man/conflict.8 man/dist.1 man/dp.8 man/flist.1 man/flists.1 \
-          man/fmtdump.8 man/fnext.1 man/folder.1 man/folders.1 \
+          man/fmtdump.8 man/fmttest.1 man/fnext.1 man/folder.1 man/folders.1 \
           man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
-          man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-format.5 \
-          man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 man/mh-sequence.5 \
-          man/mh-tailor.5 man/mhbuild.1 man/mhl.1 man/mhlist.1 \
-          man/mhmail.1 man/mhn.1 man/mhparam.1 man/mhpath.1 \
-          man/mhshow.1 man/mhstore.1 man/msgchk.1 man/msh.1 \
+          man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-folders.5 \
+          man/mh-format.5 man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 \
+          man/mh-sequence.5 man/mh-tailor.5 man/mhbuild.1 man/mhfixmsg.1 \
+          man/mhl.1 man/mhlist.1 man/mhmail.1 man/mhn.1 man/mhparam.1 \
+          man/mhpath.1 man/mhshow.1 man/mhstore.1 man/msgchk.1 man/msh.1 \
           man/mts.conf.5 man/new.1 man/next.1 man/nmh.7 man/packf.1 \
           man/pick.1 man/post.8 man/prev.1 man/prompter.1 man/rcvdist.1 \
           man/rcvpack.1 man/rcvstore.1 man/rcvtty.1 man/refile.1 \
@@ -203,36 +226,41 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
           man/sendfiles.1 man/show.1 man/slocal.1 man/sortm.1 man/unseen.1 \
           man/whatnow.1 man/whom.1
 
+##
+## Sources for our man pages
+##
+man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
+          man/conflict.man man/dist.man man/dp.man man/flist.man \
+          man/flists.man man/fmtdump.man man/fmttest.man man/fnext.man \
+          man/folder.man man/folders.man man/forw.man man/fprev.man \
+          man/inc.man man/install-mh.man man/mark.man man/mh-alias.man \
+          man/mh-chart-gen.sh man/mh-draft.man man/mh-folders.man \
+          man/mh-format.man man/mh-mail.man man/mh-profile.man \
+          man/mh_profile.man man/mh-sequence.man man/mh-tailor.man \
+          man/mhbuild.man man/mhfixmsg.man man/mhl.man man/mhlist.man \
+          man/mhmail.man man/mhn.man man/mhparam.man man/mhpath.man \
+          man/mhshow.man man/mhstore.man man/msgchk.man man/msh.man \
+          man/mts.conf.man man/new.man man/next.man man/nmh.man \
+          man/packf.man man/pick.man man/post.man man/prev.man \
+          man/prompter.man man/rcvdist.man man/rcvpack.man \
+          man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
+          man/rmf.man man/rmm.man man/scan.man man/send.man \
+          man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
+          man/unseen.man man/whatnow.man man/whom.man
+
 ##
 ## Files we need to include in the distribution which aren't found by
 ## Automake using the automatic rules
 ##
-EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
-            etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE MACHINES \
+EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
+            etc/mhn.defaults.sh 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 \
-            man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
-            man/conflict.man man/dist.man man/dp.man man/flist.man \
-            man/flists.man man/fmtdump.man man/fnext.man man/folder.man \
-            man/folders.man man/forw.man man/fprev.man man/inc.man \
-            man/install-mh.man man/mark.man man/mh-alias.man \
-            man/mh-chart-gen.sh man/mh-draft.man man/mh-format.man \
-            man/mh-mail.man man/mh-profile.man man/mh_profile.man \
-            man/mh-sequence.man man/mh-tailor.man man/mhbuild.man man/mhl.man \
-            man/mhlist.man man/mhmail.man man/mhn.man man/mhparam.man \
-            man/mhpath.man man/mhshow.man man/mhstore.man man/msgchk.man \
-            man/msh.man man/mts.conf.man man/new.man man/next.man man/nmh.man \
-            man/packf.man man/pick.man man/post.man man/prev.man \
-            man/prompter.man man/rcvdist.man man/rcvpack.man \
-            man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
-            man/rmf.man man/rmm.man man/scan.man man/send.man \
-            man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
-            man/unseen.man man/whatnow.man man/whom.man \
             test/README test/fakesendmail $(TESTS) test/inc/deb359167.mbox \
             test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
             test/inc/md5sums test/mhmail/attachment.txt \
             test/post/test-post-common.sh uip/mhmail \
-            SPECS/nmh.spec SPECS/build-nmh-cygwin
+            SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS)
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -244,7 +272,8 @@ uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
 
-uip_burst_SOURCES = uip/burst.c
+uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \
+                   uip/mhcachesbr.c uip/md5.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
@@ -275,6 +304,12 @@ uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
                      uip/mhfree.c uip/mhparse.c uip/termsbr.c uip/md5.c
 uip_mhbuild_LDADD = $(LDADD) $(TERMLIB)
 
+uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
+                      uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
+                      uip/mhshowsbr.c uip/mhlistsbr.c \
+                      uip/termsbr.c uip/md5.c
+uip_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB)
+
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
                     uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/termsbr.c \
                     uip/md5.c
@@ -311,6 +346,7 @@ uip_new_SOURCES = uip/new.c
 uip_packf_SOURCES = uip/packf.c uip/dropsbr.c
 
 uip_pick_SOURCES = uip/pick.c uip/picksbr.c
+uip_pick_LDADD = $(LDADD) $(ICONVLIB)
 
 uip_prompter_SOURCES = uip/prompter.c
 
@@ -355,6 +391,9 @@ uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 uip_fmtdump_SOURCES = uip/fmtdump.c
 uip_fmtdump_LDADD = $(LDADD) $(ICONVLIB)
 
+uip_fmttest_SOURCES = uip/fmttest.c uip/termsbr.c
+uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
 uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip/termsbr.c
 uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 
@@ -364,7 +403,7 @@ uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \
 uip_mhtest_LDADD = $(LDADD) $(TERMLIB)
 
 uip_post_SOURCES = uip/post.c uip/aliasbr.c
-uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB)
+uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(TLSLIB)
 
 uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c
 uip_rcvdist_LDADD = $(LDADD) $(ICONVLIB)
@@ -379,8 +418,6 @@ uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
 uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS)
 
-uip_spost_SOURCES = uip/spost.c uip/aliasbr.c
-
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c
 
@@ -390,9 +427,18 @@ test_getfullname_LDADD = sbr/libmh.a
 test_getfqdn_SOURCES = test/getfqdn.c
 test_getfqdn_LDADD =
 
+test_fakepop_SOURCES = test/fakepop.c
+test_fakepop_LDADD =
+
 test_fakesmtp_SOURCES = test/fakesmtp.c
 test_fakesmtp_LDADD =
 
+test_getcwidth_SOURCES = test/getcwidth.c
+test_getcwidth_LDADD =
+
+etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c
+etc_gen_ctype_checked_LDADD =
+
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
@@ -402,21 +448,24 @@ config/version.c: Makefile
 sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
        $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
 
+sbr/ctype-checked.h: etc/gen-ctype-checked
+       etc/gen-ctype-checked
+
+sbr/ctype-checked.c: etc/gen-ctype-checked sbr/ctype-checked.h
+
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
-       rm -f $@
+       @rm -f $@
        $(SED) -e 's,%mts%,$(MTS),' \
               -e 's,%mailspool%,$(mailspool),' \
               -e 's,%smtpservers%,$(smtpservers),' \
+              -e 's,%default_locking%,$(default_locking),' \
+              -e 's,%supported_locks%,$(supported_locks),' \
                                < $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
-       rm -f $@
+       @rm -f $@
        $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
-etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
-       rm -f $@
-       $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/etc/sendfiles.in > $@
-
 ##
 ## Use configure to set up default LN, but through a make variable so
 ## that it can be overridden at install time.
@@ -428,13 +477,13 @@ LN = @LN@
 ## between different programs.
 ##
 install-exec-hook:
-       rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
        $(LN) $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT)
        $(LN) $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT)
        $(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT)
@@ -462,26 +511,30 @@ uninstall-hook:
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
 ##
-sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
-                     sbr/check_charset.c sbr/client.c sbr/closefds.c \
-                     sbr/concat.c sbr/context_del.c sbr/context_find.c \
-                     sbr/context_foil.c sbr/context_read.c \
+sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
+                     sbr/base64.c \
+                     sbr/brkstring.c sbr/check_charset.c sbr/client.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/cpydgst.c sbr/crawl_folders.c sbr/discard.c \
-                     sbr/done.c sbr/dtime.c sbr/escape_addresses.c \
-                     sbr/error.c  sbr/ext_hook.c sbr/fdcompare.c \
+                     sbr/cpydgst.c sbr/crawl_folders.c sbr/credentials.c \
+                     sbr/discard.c sbr/done.c sbr/dtimep.l sbr/dtime.c \
+                     sbr/escape_addresses.c \
+                     sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \
                      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
                      sbr/folder_free.c sbr/folder_pack.c \
                      sbr/folder_read.c sbr/folder_realloc.c sbr/gans.c \
                      sbr/getans.c sbr/getanswer.c sbr/getarguments.c \
-                     sbr/getcpy.c sbr/getfolder.c sbr/getpass.c \
+                     sbr/getcpy.c sbr/geteditor.c sbr/getfolder.c \
+                     sbr/getpass.c \
                      sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \
                      sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
                      sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
                      sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
-                     sbr/m_maildir.c sbr/m_name.c \
-                     sbr/makedir.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \
+                     sbr/m_maildir.c sbr/m_name.c sbr/m_rand.c \
+                     sbr/makedir.c sbr/message_id.c sbr/mts.c \
+                     sbr/norm_charmap.c sbr/path.c \
                      sbr/peekc.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 \
@@ -491,23 +544,23 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
                      sbr/seq_print.c sbr/seq_read.c sbr/seq_save.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/strcasecmp.c \
+                     sbr/snprintb.c sbr/ssequal.c \
                      sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \
-                     sbr/fmt_def.c sbr/m_msgdef.c sbr/mf.c sbr/utils.c \
-                     sbr/m_mktemp.c sbr/getansreadline.c config/config.c \
-                     config/version.c
+                     sbr/fmt_def.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
+
+##
+## Because these files use the definitions in the libmh rule below,
+## they need to be rebuilt if the Makefile changes.
+##
+
+config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
 sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DMAILSPOOL='"$(mailspool)"' \
                -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
-               -DNMHLIBDIR='"$(libdir)"' \
-               -DDEFAULT_EDITOR='"$(editorpath)"' \
-               -DDEFAULT_PAGER='"$(pagerpath)"'
-
-sbr_libdtimep_a_SOURCES = sbr/dtimep.l
-sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \
-                        $(DISABLE_UNUSED_MACROS_WARNING) \
-                        $(DISABLE_SIGN_COMPARE_WARNING)
+               -DNMHLIBDIR='"$(libdir)"'
 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
@@ -525,15 +578,14 @@ $(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,%default_locking%,$(default_locking),g' >> $@
+       @echo 's,%supported_locks%,$(supported_locks),g' >> $@
        @echo 's,%manext1%,$(manext1),g' >> $@
        @echo 's,%manext5%,$(manext5),g' >> $@
        @echo 's,%manext7%,$(manext7),g' >> $@
@@ -545,25 +597,32 @@ man/man.sed: Makefile
        @echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
        @echo ' s,%mhl_reply%,,g' >> $@
 
-man/mh-chart.man:
-       @$(srcdir)/man/mh-chart-gen.sh > $@
+man/mh-chart.man: $(man_SRCS)
+       $(srcdir)/man/mh-chart-gen.sh > $@
 
 .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.$(manext7):
-       @$(SED) -f man/man.sed $< > $@
+       $(SED) -f man/man.sed $< > $@
 
 .man.$(manext8):
-       @$(SED) -f man/man.sed $< > $@
+       $(SED) -f man/man.sed $< > $@
+
+man: $(man_MANS)
+
+cleanman:
+       rm -f $(man_MANS)
+
+.PHONY: man cleanman
 
 ## Don't include commit hashes in ChangeLog.
 ChangeLog:
-       @[ -d .git ]  &&  git --no-pager log --abbrev-commit | \
-           egrep -v '^commit [0-9a-f]+$$' > $@  ||  true
+       @[ -d $(srcdir)/.git ]  &&  (cd $(srcdir); git --no-pager log --abbrev-commit | \
+           egrep -v '^commit [0-9a-f]+$$' > $@)  ||  true
 ## Make ChangeLog phony so it will always get regenerated.  But don't
 ## fail if we don't have a git repository in order to allow
 ## regeneration of distribution archive or RPM.
@@ -582,14 +641,6 @@ rpm: dist
          -ba SPECS/nmh.spec
 .PHONY: rpm
 
-##
-## A target to build information needed by cscope
-##
-cscope:
-       echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
-       find $(srcdir) \( -name docs -prune \) -o \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files
-.PHONY: cscope
-
 
 ##
 ## Use GNU gcov to find the coverage of the test suite.