X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b5481a756851b8ee1626aaf8f66dc4e4a11e6695..9322ba2854211794c27fae9468768b80b767c211:/Makefile.am?ds=sidebyside diff --git a/Makefile.am b/Makefile.am index 80e9cc7c..1ae131eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \ MH_VERSION="$(VERSION)" \ OAUTH_SUPPORT='@OAUTH_SUPPORT@' \ CURL_USER_AGENT='@CURL_USER_AGENT@' \ - MH_TEST_DIR="@abs_builddir@/test/testdir" \ + MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \ nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \ mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \ nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \ @@ -55,9 +55,11 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/bad-input/test-header \ 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-recurse test/folder/test-sortm \ - test/folder/test-total \ + test/folder/test-coverage \ + test/folder/test-create test/folder/test-nocreate \ + test/folder/test-packf test/folder/test-recurse \ + test/folder/test-sortm test/folder/test-total \ + test/format/test-ap \ test/format/test-curses test/format/test-dp \ test/format/test-fmtdump test/format/test-functions \ test/format/test-localmbox test/format/test-myname \ @@ -65,68 +67,78 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/format/test-nullstr \ test/format/test-rightjustify \ test/format/test-unquote \ + test/forw/test-forw-coverage \ 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/inc/test-msgchk \ test/inc/test-pop \ - test/install-mh/test-install-mh \ + test/install-mh/test-install-mh test/install-mh/test-version-check \ test/locking/test-datalocking test/locking/test-spoollocking \ test/manpages/test-manpages \ - test/mhbuild/test-attach \ + test/mhbuild/test-attach test/mhbuild/test-mhbuild \ test/mhbuild/test-cte \ test/mhbuild/test-ext-params \ test/mhbuild/test-forw test/mhbuild/test-header-encode \ test/mhbuild/test-utf8-body \ test/mhfixmsg/test-mhfixmsg test/mhical/test-mhical \ - test/mhl/test-mhl-flags \ + test/mhl/test-mhl-flags test/mhl/test-rfc6532 \ test/mhlist/test-mhlist test/mhlist/test-ext-params \ test/mhmail/test-mhmail \ test/mhparam/test-mhparam test/mhpath/test-mhpath \ + test/mhshow/test-binary \ test/mhshow/test-charset test/mhshow/test-textcharset \ test/mhshow/test-cte-binary test/mhshow/test-qp \ test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \ test/mhstore/test-mhstore test/mkstemp/test-mkstemp \ test/new/test-basic test/pick/test-pick test/pick/test-stderr \ test/oauth/test-mhlogin test/oauth/test-mhparam test/oauth/test-send \ - test/oauth/test-inc test/oauth/test-share \ + test/oauth/test-sendfrom test/oauth/test-inc test/oauth/test-share \ 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/post/test-messageid \ - test/post/test-sendfiles test/prompter/test-prompter \ + test/post/test-rfc6531 test/post/test-sendfiles \ + test/prompter/test-prompter \ test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \ test/rcv/test-rcvtty test/refile/test-refile test/repl/test-convert \ test/repl/test-if-str test/repl/test-trailing-newline \ test/repl/test-multicomp test/repl/test-repl \ + test/scan/test-header-parsing \ test/scan/test-scan test/scan/test-scan-multibyte \ test/sequences/test-flist test/sequences/test-mark \ test/sequences/test-out-of-range \ + test/send/test-sendfrom \ test/show/test-show \ 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. +XFAIL_TESTS = \ + # + check_SCRIPTS = test/common.sh check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \ test/getcwidth test/fakehttp +## So they can be built without builing the `check' target. +check-programs: $(check_PROGRAMS) + ## The location of installed nmhetcdir is, for all purposes except ## distcheck, $nmhetcdir. For distcheck, prepend $MH_INST_DIR (from ## test/common.sh.in), which is based on $MH_TEST_DIR (from ## $TESTS_ENVIRONMENT). -DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \ - NMHETCDIRINST='$${abs_builddir}/test/testdir/inst' +AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \ + NMHETCDIRINST='$${abs_builddir}/test/testdir/inst' ## ## Stuff that should be cleaned via "make clean" ## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c. ## -CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c etc/mts.conf \ - etc/gen-ctype-checked sbr/ctype-checked.[hc] \ - etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \ - *.plist +CLEANFILES = config/version.c sbr/dtimep.c \ + etc/bash_completion_nmh etc/mhn.defaults etc/mts.conf \ + man/man.sed man/mh-chart.man $(man_MANS) *.plist clean-local: @rm -rf RPM a.out.dSYM uip/a.out.dSYM @rm -rf test/testdir @@ -141,16 +153,12 @@ MAINTAINERCLEANFILES = atags cscope.files cscope.out cscope.in.out cscope.po.out ## SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \ config.h.in config.h.in~ config.sub configure depcomp \ - install-sh missing ylwrap nmh-*.tar.gz nmh-*.tar.gz.sig + install-sh missing test-driver ylwrap nmh-*.tar.gz \ + nmh-*.tar.gz.sig superclean: maintainer-clean @rm -f $(SUPERCLEANFILES) .PHONY: superclean -## -## Files that need to be built before everything else -## -BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c - ## ## This is a list of all programs that get installed in the "bin" directory ## Note that primary difference between "PROGRAMS" and "SCRIPTS" is that @@ -175,13 +183,6 @@ nmhlibexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \ nmhlibexec_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 @@ -195,9 +196,9 @@ noinst_LIBRARIES = sbr/libmh.a mts/libmts.a noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \ h/fmt_compile.h h/fmt_scan.h h/icalendar.h h/md5.h h/mf.h \ h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.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 \ - mts/smtp/smtp.h sbr/ctype-checked.h h/oauth.h \ + h/mts.h h/nmh.h h/netsec.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 mts/smtp/smtp.h sbr/ctype-checked.h h/oauth.h \ thirdparty/jsmn/jsmn.h ## @@ -209,7 +210,7 @@ dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \ etc/mhl.body etc/mhl.digest etc/mhl.format etc/mhl.forward \ etc/mhl.headers etc/mhl.reply etc/mhl.replywithoutbody \ etc/mhshow.marker etc/rcvdistcomps etc/rcvdistcomps.outbox \ - etc/replcomps etc/replgroupcomps \ + etc/replcomps etc/replgroupcomps etc/rmmproc.messageid \ etc/scan.MMDDYY \ etc/scan.YYYYMMDD etc/scan.curses etc/scan.default \ etc/scan.highlighted \ @@ -220,14 +221,14 @@ dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \ ## The same as above, but we don't include these in the distribution ## (because they're generated at compile time) ## -nmhetc_DATA = etc/mhn.defaults etc/mts.conf +nmhetc_DATA = etc/bash_completion_nmh etc/mhn.defaults etc/mts.conf ## ## Documentation that gets installed in docdir ## dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ - docs/COMPLETION-BASH docs/COMPLETION-TCSH \ - docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \ + docs/COMPLETION-TCSH docs/COMPLETION-ZSH \ + docs/DIFFERENCES docs/FAQ \ docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \ docs/README-HOOKS docs/README-components docs/README.about \ docs/README.SASL docs/README.developers docs/README.manpages \ @@ -236,15 +237,16 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ ## ## Contribs that get installed in docdir/contrib/ ## -contribdir = $(docdir)/contrib -dist_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \ - docs/contrib/ml docs/contrib/vpick -dist_contrib_DATA = docs/contrib/replaliases +docs_contribdir = $(docdir)/contrib +dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter \ + docs/contrib/localpostproc docs/contrib/ml \ + docs/contrib/vpick docs/contrib/replaliases +dist_docs_contrib_DATA = docs/contrib/replaliases ## ## Our man pages ## -man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ +man_MANS = man/MH.7 man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ man/dist.1 man/dp.8 man/flist.1 man/flists.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 \ @@ -263,8 +265,8 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ ## ## Sources for our man pages ## -man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \ - man/dist.man man/dp.man man/flist.man \ +man_SRCS = man/MH.man man/ali.man man/anno.man man/ap.man man/burst.man \ + man/comp.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 \ @@ -286,8 +288,9 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \ ## Files we need to include in the distribution which aren't found by ## Automake using the automatic rules ## -EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk sbr/icalparse.h \ - etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \ +EXTRA_DIST = autogen.sh build_nmh config/version.sh sbr/icalparse.h \ + etc/bash_completion_nmh-gen etc/mhn.defaults.sh etc/mts.conf.in \ + 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 \ @@ -298,10 +301,10 @@ EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk sbr/icalparse.h \ test/mhbuild/somebinary \ test/mhbuild/nulls \ test/mhbuild/textplain \ - test/post/test-post-common.sh test/valgrind.supp \ + test/post/test-post-common.sh test/send/README \ test/oauth/common.sh \ - uip/mhmail \ - SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS) + test/valgrind.supp uip/mhmail \ + SPECS/nmh.spec SPECS/nmh.cygport $(man_SRCS) ## ## These are all of the definitions for each of the programs listed above. @@ -318,16 +321,16 @@ uip_anno_SOURCES = uip/anno.c uip/annosbr.c uip_anno_LDADD = $(LDADD) $(POSTLINK) uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \ - uip/mhcachesbr.c uip/md5.c + uip/mhcachesbr.c uip_burst_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK) 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) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(CURLLIB) $(POSTLINK) +uip_comp_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) 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) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(CURLLIB) $(POSTLINK) +uip_dist_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_flist_SOURCES = uip/flist.c uip_flist_LDADD = $(LDADD) $(POSTLINK) @@ -337,10 +340,11 @@ uip_folder_LDADD = $(LDADD) $(POSTLINK) 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) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(CURLLIB) $(POSTLINK) +uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c -uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) $(POSTLINK) +uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) \ + $(TLSLIB) $(POSTLINK) uip_install_mh_SOURCES = uip/install-mh.c uip_install_mh_LDADD = $(LDADD) $(POSTLINK) @@ -350,25 +354,24 @@ uip_mark_LDADD = $(LDADD) $(POSTLINK) uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \ uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c \ - uip/mhfree.c uip/mhparse.c uip/md5.c \ + uip/mhfree.c uip/mhparse.c \ uip/mhstoresbr.c uip/mhshowsbr.c uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) 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/md5.c + uip/mhshowsbr.c uip/mhlistsbr.c uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhical_SOURCES = uip/mhical.c uip_mhical_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \ - uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/md5.c + uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip_mhlist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \ - uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \ - uip/md5.c + uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c uip_mhn_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhparam_SOURCES = uip/mhparam.c @@ -379,16 +382,16 @@ uip_mhpath_LDADD = $(LDADD) $(POSTLINK) uip_mhshow_SOURCES = uip/mhshow.c uip/mhparse.c uip/mhcachesbr.c \ uip/mhshowsbr.c uip/mhlistsbr.c uip/mhmisc.c \ - uip/mhfree.c uip/md5.c + uip/mhfree.c uip_mhshow_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \ uip/mhshowsbr.c uip/mhlistsbr.c uip/mhstoresbr.c \ - uip/mhmisc.c uip/mhfree.c uip/md5.c + uip/mhmisc.c uip/mhfree.c uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c -uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(POSTLINK) +uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) $(POSTLINK) uip_new_SOURCES = uip/new.c uip_new_LDADD = $(LDADD) $(POSTLINK) @@ -407,7 +410,7 @@ uip_refile_LDADD = $(LDADD) $(POSTLINK) 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) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(CURLLIB) $(POSTLINK) +uip_repl_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_rmf_SOURCES = uip/rmf.c uip_rmf_LDADD = $(LDADD) $(POSTLINK) @@ -420,7 +423,7 @@ uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c \ uip/distsbr.c -uip_send_LDADD = $(LDADD) $(CURLLIB) $(POSTLINK) +uip_send_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_show_SOURCES = uip/show.c uip/mhlsbr.c uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) @@ -430,13 +433,13 @@ uip_sortm_LDADD = $(LDADD) $(POSTLINK) uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c -uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(CURLLIB) $(POSTLINK) +uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_whom_SOURCES = uip/whom.c uip/distsbr.c uip_whom_LDADD = $(LDADD) $(POSTLINK) ## -## Programs definitions for all utilities that end up in $(nmhlibexecdir) +## Program definitions for all utilities that end up in $(nmhlibexecdir) ## uip_ap_SOURCES = uip/ap.c @@ -461,7 +464,8 @@ uip_mkstemp_SOURCES = uip/mkstemp.c uip_mkstemp_LDADD = $(LDADD) $(POSTLINK) uip_post_SOURCES = uip/post.c uip/aliasbr.c -uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(TLSLIB) $(POSTLINK) +uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) \ + $(POSTLINK) uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c uip_rcvdist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) @@ -480,7 +484,11 @@ uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) $(POSTLINK) uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c -uip_viamail_LDADD = $(LDADD) $(POSTLINK) +uip_viamail_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) + +## +## Other program definitions +## test_getfullname_SOURCES = test/getfullname.c test_getfullname_LDADD = $(LDADD) $(POSTLINK) @@ -495,14 +503,11 @@ test_fakesmtp_SOURCES = test/fakesmtp.c test/server.c test_fakesmtp_LDADD = $(POSTLINK) test_fakehttp_SOURCES = test/fakehttp.c test/server.c -test_fakehttp_LDADD = $(POSTLINK) +test_fakehttp_LDADD = $(LDADD) $(POSTLINK) test_getcwidth_SOURCES = test/getcwidth.c test_getcwidth_LDADD = $(POSTLINK) -etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c -etc_gen_ctype_checked_LDADD = $(POSTLINK) - ## ## Our rebuild rules for files that aren't built via the normal mechanisms ## @@ -513,24 +518,21 @@ etc_gen_ctype_checked_LDADD = $(POSTLINK) config/version.c: Makefile $(srcdir)/config/version.sh env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c -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/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen + $(MKDIR_P) $(@D) # FIXME: A better way? + $(srcdir)/etc/bash_completion_nmh-gen > $@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile @rm -f $@ $(SED) -e 's,%mts%,$(MTS),' \ -e 's,%mailspool%,$(mailspool),' \ - -e 's,%smtpservers%,$(smtpservers),' \ + -e 's,%smtpserver%,$(smtpserver),' \ -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) + $(MKDIR_P) $(@D) # FIXME: A better way? @rm -f $@ $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@ @@ -585,7 +587,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/copyip.c sbr/cpydata.c \ sbr/cpydgst.c sbr/crawl_folders.c sbr/credentials.c \ sbr/discard.c sbr/done.c sbr/dtimep.l sbr/dtime.c \ sbr/encode_rfc2047.c \ @@ -593,10 +595,11 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/folder_read.c sbr/folder_realloc.c sbr/read_switch.c \ + sbr/read_switch_multiword.c sbr/read_switch_multiword_via_readline.c \ + sbr/read_yes_or_no_if_tty.c sbr/getarguments.c \ sbr/getcpy.c sbr/geteditor.c sbr/getfolder.c \ - sbr/getpass.c \ + sbr/getpass.c sbr/read_line.c \ sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \ sbr/fmt_rfc2047.c sbr/fmt_scan.c \ sbr/icalparse.y sbr/icalendar.l sbr/datetime.c \ @@ -604,9 +607,10 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/m_popen.c sbr/m_rand.c \ - sbr/makedir.c sbr/message_id.c sbr/mime_type.c sbr/mts.c \ + sbr/makedir.c sbr/md5.c sbr/message_id.c \ + sbr/mime_type.c sbr/mts.c sbr/netsec.c \ sbr/norm_charmap.c sbr/path.c \ - sbr/peekc.c sbr/pidwait.c sbr/pidstatus.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 \ sbr/r1bindex.c sbr/readconfig.c sbr/ruserpass.c \ @@ -620,10 +624,12 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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 sbr/oauth.c \ + sbr/m_mktemp.c sbr/vector.c sbr/oauth.c sbr/oauth_prof.c \ + config/config.c config/version.c \ thirdparty/jsmn/jsmn.c +sbr_libmh_a_LIBADD = $(LIBOBJS) + ## ## Because these files use the definitions in the libmh rule below, ## they need to be rebuilt if the Makefile changes. @@ -631,7 +637,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \ config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile -sbr_libmh_a_CPPFLAGS = -I./sbr \ +sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} -I./sbr \ -DNMHBINDIR='"$(bindir)"' \ -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \ -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \ @@ -725,16 +731,17 @@ rpm: dist ## These targets are not integrated into the other automake ## targets because they will be used so infrequently, if at all. ## -gcov: - @if ./config.status --config | grep -e --enable-debug >/dev/null; then \ - echo For best results with gcov, configure without --enable-debug; \ - fi +gcov: gcov-rebuild gcov-run gcov-process gcov-report +gcov-rebuild: @echo rebuilding with AM_CFLAGS=--coverage . . . - @(make clean && make AM_CFLAGS=--coverage) > /dev/null && \ - make check AM_CFLAGS=--coverage + @(make clean && make AM_CFLAGS=--coverage) > /dev/null +gcov-run: + make check AM_CFLAGS=--coverage +gcov-process: @for i in `find . -name '*.gcda'`; do \ - gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ + gcov -pro `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ done +gcov-report: @for i in `find . -name '*.gcno'`; do \ if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \ echo untested: $$i; \ @@ -744,7 +751,8 @@ gcov-mostlyclean: @find . -name '*.gcno' -o -name '*.gcda' | xargs rm gcov-clean: gcov-mostlyclean @find . -name '*.gcov' | xargs rm -.PHONY: gcov gcov-mostlyclean gcov-clean +.PHONY: gcov gcov-rebuild gcov-run gcov-process gcov-report \ + gcov-mostlyclean gcov-clean ##