Sigh. Turns out last change broke a few tests, because it trimmed the
[mmh] / Makefile.am
index eea18db..057e37a 100644 (file)
@@ -50,6 +50,7 @@ TESTS = test/bad-input/test-header \
        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/manpages/test-manpages test/mhbuild/test-forw \
        test/mhlist/test-mhlist test/mhparam/test-mhparam \
        test/mhpath/test-mhpath \
@@ -60,11 +61,14 @@ TESTS = test/bad-input/test-header \
        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/post/test-post-group \
        test/refile/test-refile \
-       test/repl/test-if-str test/scan/test-scan \
+       test/repl/test-if-str test/repl/test-trailing-newline \
+       test/repl/test-multicomp \
+       test/scan/test-scan \
        test/sequences/test-flist test/sequences/test-mark \
        test/whatnow/test-attach-detach test/whatnow/test-cd \
-       test/whatnow/test-ls \
+       test/whatnow/test-ls test/whom/test-whom \
        test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
@@ -74,7 +78,7 @@ check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp
 ## Stuff that should be cleaned via "make clean"
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
-            etc/mhn.defaults man/man.sed $(man_MANS)
+            etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
 clean-local:
        @rm -rf RPM a.out.DSYM uip/a.out.DSYM
        @rm -rf test/testdir
@@ -197,21 +201,22 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
             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.man \
-            man/mh-draft.man man/mh-format.man man/mh-mail.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/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-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 $(TESTS) \
-            test/inc/deb359167.mbox test/inc/fromline.txt \
-            test/inc/msgheader.txt test/inc/filler.txt test/inc/md5sums \
-            test/post/test-post-common.sh
+            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/post/test-post-common.sh
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -227,11 +232,11 @@ uip_burst_SOURCES = uip/burst.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
-uip_comp_LDADD = $(LDADD) $(ICONVLIB)
+uip_comp_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
-uip_dist_LDADD = $(LDADD) $(ICONVLIB)
+uip_dist_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
 
 uip_flist_SOURCES = uip/flist.c
 
@@ -239,7 +244,7 @@ uip_folder_SOURCES = uip/folder.c
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
-uip_forw_LDADD = $(LDADD) $(ICONVLIB)
+uip_forw_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
                  uip/popsbr.c
@@ -299,7 +304,7 @@ uip_refile_SOURCES = uip/refile.c
 
 uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c \
                   uip/whatnowsbr.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
-uip_repl_LDADD = $(LDADD) $(ICONVLIB)
+uip_repl_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
 
 uip_rmf_SOURCES = uip/rmf.c
 
@@ -317,6 +322,7 @@ uip_sortm_SOURCES = uip/sortm.c
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c
+uip_whatnow_LDADD = $(LDADD) $(READLINELIB)
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
 
@@ -365,7 +371,7 @@ uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c
 
 test_getfullname_SOURCES = test/getfullname.c
-test_getfullname_LDADD =
+test_getfullname_LDADD = sbr/libmh.a
 
 test_getfqdn_SOURCES = test/getfqdn.c
 test_getfqdn_LDADD =
@@ -448,7 +454,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.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/done.c sbr/dtime.c sbr/escape_display_name.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 \
@@ -473,7 +479,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
                      sbr/snprintb.c sbr/ssequal.c sbr/strcasecmp.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 config/config.c config/version.c
+                     sbr/m_mktemp.c sbr/getansreadline.c config/config.c \
+                     config/version.c
 
 sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DMAILSPOOL='"$(mailspool)"' \
@@ -519,6 +526,9 @@ 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.$(manext1):
        @$(SED) -f man/man.sed $< > $@
 
@@ -567,7 +577,10 @@ cscope:
 ## targets because they will be used so infrequently, if at all.
 ##
 gcov:
-       @echo rebuilding with AM_CLFAGS=--coverage . . .
+       @if ./config.status --config | grep -e --enable-debug >/dev/null; then \
+          echo For best results with gcov, configure without --enable-debug; \
+        fi
+       @echo rebuilding with AM_CFLAGS=--coverage . . .
        @(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null  &&  make check
        @for i in `find . -name '*.gcda'`; do \
           gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \