From: Ken Hornstein Date: Mon, 21 Jan 2013 15:58:07 +0000 (-0500) Subject: Merge branch 'master' into format-test X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/c703902741e0f7ce55f87e48ef0d00901195f1bc?ds=sidebyside;hp=-c Merge branch 'master' into format-test --- c703902741e0f7ce55f87e48ef0d00901195f1bc diff --combined .gitignore index e5c3e6f3,0be1cc28..ebf140c2 --- a/.gitignore +++ b/.gitignore @@@ -5,6 -5,7 +5,7 @@@ /ChangeLog /Makefile.in /aclocal.m4 + /ar-lib /compile /config.guess /config.h.in @@@ -23,6 -24,8 +24,8 @@@ /sbr/dtimep.c /cscope.files /cscope.out + /cscope.in.out + /cscope.po.out # Removed by distclean: .deps/ @@@ -57,7 -60,6 +60,7 @@@ a.out.dSYM /uip/dp /uip/flist /uip/fmtdump +/uip/fmttest /uip/folder /uip/forw /uip/inc diff --combined Makefile.am index 734f4269,b79e930d..5466f9b3 --- a/Makefile.am +++ b/Makefile.am @@@ -76,6 -76,7 +76,7 @@@ TESTS = test/ali/test-ali test/anno/tes 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 \ @@@ -97,7 -98,7 +98,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. @@@ -120,8 -121,8 +121,8 @@@ BUILT_SOURCES = sbr/sigmsg. ## 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/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 \ @@@ -210,6 -211,27 +211,27 @@@ man_MANS = man/ali.1 man/anno.1 man/ap. 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/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 + ## ## Files we need to include in the distribution which aren't found by ## Automake using the automatic rules @@@ -218,28 -240,11 +240,11 @@@ EXTRA_DIST = config/version.sh sbr/sigm 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. @@@ -363,9 -368,6 +368,9 @@@ uip_dp_LDADD = $(LDADD) $(TERMLIB) $(IC 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) @@@ -375,7 -377,7 +380,7 @@@ uip_mhtest_SOURCES = uip/mhtest.c uip/m 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) @@@ -470,7 -472,8 +475,8 @@@ 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/base64.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 \ @@@ -483,7 -486,8 +489,8 @@@ 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 \ @@@ -509,9 -513,7 +516,7 @@@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \ -DMAILSPOOL='"$(mailspool)"' \ -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \ - -DNMHLIBDIR='"$(libdir)"' \ - -DDEFAULT_EDITOR='"$(editorpath)"' \ - -DDEFAULT_PAGER='"$(pagerpath)"' + -DNMHLIBDIR='"$(libdir)"' sbr_libdtimep_a_SOURCES = sbr/dtimep.l sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \ @@@ -540,8 -542,6 +545,6 @@@ man/man.sed: Makefil @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,%manext1%,$(manext1),g' >> $@ @echo 's,%manext5%,$(manext5),g' >> $@ @echo 's,%manext7%,$(manext7),g' >> $@ @@@ -553,7 -553,7 +556,7 @@@ @echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@ @echo ' s,%mhl_reply%,,g' >> $@ - man/mh-chart.man: + man/mh-chart.man: $(man_SRCS) $(srcdir)/man/mh-chart-gen.sh > $@ .man.$(manext1): @@@ -597,14 -597,6 +600,6 @@@ rpm: dis -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.