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)" \
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-create test/folder/test-nocreate \
+ test/folder/test-packf test/folder/test-recurse \
+ test/folder/test-sortm test/folder/test-total \
test/format/test-curses test/format/test-dp \
test/format/test-fmtdump test/format/test-functions \
test/format/test-localmbox test/format/test-myname \
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/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/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 \
## 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"
##
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
+BUILT_SOURCES = sbr/ctype-checked.c
##
## This is a list of all programs that get installed in the "bin" directory
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
##
##
## 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/build_nmh \
+ 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 \
##
## 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 \
## 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 \
+EXTRA_DIST = autogen.sh config/version.sh sbr/icalparse.h \
etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \
$(MHNSEARCHPROG) DATE MACHINES \
docs/ChangeLog_MH-3_to_MH-6.6 \
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.
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)
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)
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
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)
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)
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)
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
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)
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)
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/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 \
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/print_help.c sbr/print_sw.c sbr/print_version.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
##
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)"' \
projects / nmh / blobdiff