Fixed strip_crs() in mhfixmsg to work even if it's the

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 074adb263eec78a2d688dcbb5ea9a090e9955143..78cce559d46bf13ed64fb3472309c2fbe558f941 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
        test/locking/test-datalocking test/locking/test-spoollocking \
        test/manpages/test-manpages \
        test/mhbuild/test-forw test/mhbuild/test-utf8-body \
        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/mhlist/test-mhlist test/mhmail/test-mhmail \
        test/mhparam/test-mhparam test/mhpath/test-mhpath \
        test/mhshow/test-cte-binary test/mhshow/test-qp \


@@ -129,11 +130,11 @@ BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
               uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
               uip/fmttest 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/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
 
 
 bin_SCRIPTS = uip/mhmail etc/sendfiles
 


@@ -204,7 +205,7 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
 ##
 contribdir = $(docdir)/contrib
 dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \
 ##
 contribdir = $(docdir)/contrib
 dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \

-                   docs/contrib/ml
+                   docs/contrib/ml docs/contrib/vpick

 
 ##
 ## Our man pages
 
 ##
 ## Our man pages


@@ -215,9 +216,9 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.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-folders.5 \
           man/mh-format.5 man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 \
           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-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/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-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 \
           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 \


@@ -236,10 +237,10 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.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/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/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/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/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 \


@@ -303,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/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
 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


@@ -511,8 +518,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/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/dtimep.l sbr/dtime.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/escape_addresses.c \
                      sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \
                      sbr/folder_addmsg.c sbr/folder_delmsgs.c \


@@ -537,11 +544,18 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/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/mf.c sbr/utils.c sbr/ctype-checked.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/m_mktemp.c sbr/getansreadline.c config/config.c \
-                     config/version.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)"' \
 
 sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DMAILSPOOL='"$(mailspool)"' \