X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2181cd0442664bf083825fd5b2d789714ba1812d..b026ceb4391bd8aa04f8882e00caf7b4c70f3161:/Makefile.am?ds=sidebyside diff --git a/Makefile.am b/Makefile.am index 4ed415d8..55525270 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ ## We set this to get our autoconf macros in the m4 directory ACLOCAL_AMFLAGS = -I m4 +AM_YFLAGS = -d + ## ## This is the default set of libraries all programs link against. Some ## programs add extra libraries to this set, so they override this with @@ -21,23 +23,24 @@ LDADD = sbr/libmh.a ## MHNSEARCHPATH is the default path to look for MIME content handlers ## MHNSEARCHPROG is the script used to find the support programs ## -MHNSEARCHPATH = "$(PATH):/usr/demo/SOUND" +MHNSEARCHPATH = "$(PATH)" MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh ## -## Automake doesn't let us install programs in $(libdir), so we create our -## own directory prefix to use in the primary variable. +## Install config files and back-end programs in our own subdirecctories. ## -auxexecdir = @libdir@ +nmhetcdir = @sysconfdir@/nmh +nmhlibexecdir = @libexecdir@/nmh ## ## nmh _does_ have a test suite! ## TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \ MH_TEST_DIR="@abs_builddir@/test/testdir" \ - auxexecdir="$(auxexecdir)" bindir="$(bindir)" \ - mandir="$(mandir)" sysconfdir="$(sysconfdir)" \ + nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \ + mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \ supported_locks="$(supported_locks)" \ + default_locking="${default_locking}" \ MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \ ICONV_ENABLED=$(ICONV_ENABLED) \ $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT. @@ -51,7 +54,8 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/folder/test-create test/folder/test-packf \ test/folder/test-recurse test/folder/test-sortm \ test/folder/test-total \ - test/format/test-dp test/format/test-fmtdump \ + 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/format/test-myhost test/format/test-mymbox \ test/format/test-nullstr \ @@ -64,16 +68,21 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/install-mh/test-install-mh \ test/locking/test-datalocking test/locking/test-spoollocking \ test/manpages/test-manpages \ + test/mhbuild/test-attach \ + 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/mhlist/test-mhlist test/mhmail/test-mhmail \ + test/mhfixmsg/test-mhfixmsg test/mhical/test-mhical \ + test/mhl/test-mhl-flags \ + test/mhlist/test-mhlist test/mhlist/test-ext-params \ + test/mhmail/test-mhmail \ test/mhparam/test-mhparam test/mhpath/test-mhpath \ - test/mhshow/test-charset \ + 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/new/test-basic \ - test/pick/test-pick test/pick/test-stderr \ + test/mhstore/test-mhstore test/mkstemp/test-mkstemp \ + test/new/test-basic test/pick/test-pick test/pick/test-stderr \ 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 \ @@ -81,7 +90,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/post/test-post-group test/post/test-mts test/post/test-messageid \ 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/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-scan test/scan/test-scan-multibyte \ @@ -99,10 +108,12 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 ## ## 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 etc/mts.conf \ - etc/gen-ctype-checked sbr/ctype-checked.h sbr/ctype-checked.c \ - etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) +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 clean-local: @rm -rf RPM a.out.dSYM uip/a.out.dSYM @rm -rf test/testdir @@ -110,7 +121,7 @@ clean-local: ## ## Stuff that should be cleaned via "make maintainer-clean" ## -MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out +MAINTAINERCLEANFILES = atags cscope.files cscope.out cscope.in.out cscope.po.out *.plist ## ## And our own superclean, to get everything left by maintainer-clean. @@ -134,22 +145,22 @@ 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 \ - uip/mark uip/mhbuild uip/mhfixmsg uip/mhlist uip/mhn \ + uip/mark uip/mhbuild uip/mhfixmsg uip/mhical 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/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 ## -## This is all programs that get installed in the "lib" directory +## This is all programs that get installed in the "libexec/nmh" directory ## -auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \ - uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \ - uip/viamail uip/mhtest +nmhlibexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \ + uip/post uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty \ + uip/slocal uip/viamail -auxexec_SCRIPTS = uip/spost +nmhlibexec_SCRIPTS = uip/spost ## ## Programs that MAY need to get built at some point; we need to list them @@ -169,30 +180,33 @@ noinst_LIBRARIES = sbr/libmh.a mts/libmts.a ## them, but that might change in the future. ## noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \ - h/fmt_compile.h h/fmt_scan.h h/md5.h h/mf.h \ - h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.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 \ - h/vmhsbr.h mts/smtp/smtp.h sbr/ctype-checked.h + mts/smtp/smtp.h sbr/ctype-checked.h ## ## Extra files we need to install in various places ## -dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \ - etc/distcomps etc/forwcomps etc/mhl.body etc/mhl.digest \ - etc/mhl.format etc/mhl.forward etc/mhl.headers \ - etc/mhl.reply etc/rcvdistcomps etc/rcvdistcomps.outbox \ - etc/replcomps etc/replgroupcomps etc/scan.MMDDYY \ - etc/scan.YYYYMMDD etc/scan.curses etc/scan.default \ - etc/scan.highlighted \ - etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \ - etc/scan.timely etc/scan.unseen +dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \ + etc/distcomps etc/forwcomps \ + etc/mhical.12hour etc/mhical.24hour \ + 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/scan.MMDDYY \ + etc/scan.YYYYMMDD etc/scan.curses etc/scan.default \ + etc/scan.highlighted \ + etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \ + etc/scan.timely etc/scan.unseen ## ## The same as above, but we don't include these in the distribution ## (because they're generated at compile time) ## -sysconf_DATA = etc/mhn.defaults etc/mts.conf +nmhetc_DATA = etc/mhn.defaults etc/mts.conf ## ## Documentation that gets installed in docdir @@ -209,45 +223,46 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ ## Contribs that get installed in docdir/contrib/ ## contribdir = $(docdir)/contrib -dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \ - docs/contrib/ml docs/contrib/vpick +dist_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \ + docs/contrib/ml docs/contrib/vpick +dist_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/conflict.8 man/dist.1 man/dp.8 man/flist.1 man/flists.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 \ 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/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/repl.1 man/rmf.1 man/rmm.1 man/scan.1 man/send.1 \ - man/sendfiles.1 man/show.1 man/slocal.1 man/sortm.1 man/unseen.1 \ - man/whatnow.1 man/whom.1 + man/mh-format.5 man/mh-mail.5 man/mh-mime.7 man/mh-profile.5 \ + man/mh_profile.5 man/mh-sequence.5 man/mh-tailor.5 man/mhbuild.1 \ + man/mhfixmsg.1 man/mhical.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/mh-mkstemp.1 man/msgchk.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/repl.1 man/rmf.1 man/rmm.1 \ + man/scan.1 man/send.1 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/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 \ 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/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/mh-format.man man/mh-mail.man man/mh-mime.man \ + man/mh-profile.man man/mh_profile.man man/mh-sequence.man \ + man/mh-tailor.man man/mhbuild.man man/mhfixmsg.man man/mhical.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/mh-mkstemp.man man/msgchk.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 \ @@ -257,13 +272,18 @@ 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 = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \ - etc/mhn.defaults.sh etc/sendfiles $(MHNSEARCHPROG) DATE MACHINES \ +EXTRA_DIST = autogen.sh config/version.sh sbr/sigmsg.awk sbr/icalparse.h \ + etc/mts.conf.in 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 \ 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/mhbuild/tiny.jpg \ + test/mhbuild/somebinary \ + test/mhbuild/nulls \ + test/mhbuild/textplain \ test/post/test-post-common.sh test/valgrind.supp uip/mhmail \ SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS) @@ -283,15 +303,15 @@ 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_burst_LDADD = $(LDADD) $(POSTLINK) +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) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(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) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK) +uip_dist_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_flist_SOURCES = uip/flist.c uip_flist_LDADD = $(LDADD) $(POSTLINK) @@ -301,7 +321,7 @@ 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) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(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) $(POSTLINK) @@ -314,22 +334,26 @@ 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_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) + uip/mhfree.c uip/mhparse.c uip/md5.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_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB) $(POSTLINK) +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_mhlist_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) +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_mhn_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) +uip_mhn_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhparam_SOURCES = uip/mhparam.c uip_mhparam_LDADD = $(LDADD) $(POSTLINK) @@ -340,20 +364,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_mhshow_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) +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_mhstore_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) +uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(POSTLINK) -uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \ - uip/scansbr.c uip/dropsbr.c uip/mhlsbr.c -uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) - uip_new_SOURCES = uip/new.c uip_new_LDADD = $(LDADD) $(POSTLINK) @@ -369,9 +389,9 @@ uip_prompter_LDADD = $(LDADD) $(POSTLINK) uip_refile_SOURCES = uip/refile.c 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) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(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) $(POSTLINK) uip_rmf_SOURCES = uip/rmf.c uip_rmf_LDADD = $(LDADD) $(POSTLINK) @@ -382,7 +402,8 @@ uip_rmm_LDADD = $(LDADD) $(POSTLINK) uip_scan_SOURCES = uip/scan.c uip/scansbr.c uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) -uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c +uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c \ + uip/distsbr.c uip_send_LDADD = $(LDADD) $(POSTLINK) uip_show_SOURCES = uip/show.c uip/mhlsbr.c @@ -393,21 +414,18 @@ 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) $(POSTLINK) +uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(POSTLINK) uip_whom_SOURCES = uip/whom.c uip/distsbr.c uip_whom_LDADD = $(LDADD) $(POSTLINK) ## -## Programs definitions for all utilities that end up in $(libdir) +## Programs definitions for all utilities that end up in $(nmhlibexecdir) ## uip_ap_SOURCES = uip/ap.c uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) -uip_conflict_SOURCES = uip/conflict.c uip/aliasbr.c -uip_conflict_LDADD = $(LDADD) $(POSTLINK) - uip_dp_SOURCES = uip/dp.c uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) @@ -420,10 +438,8 @@ uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) -uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \ - uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \ - uip/md5.c -uip_mhtest_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) +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) @@ -443,7 +459,7 @@ uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) $(POSTLINK) -uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \ +uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c uip_viamail_LDADD = $(LDADD) $(POSTLINK) @@ -468,8 +484,12 @@ etc_gen_ctype_checked_LDADD = $(POSTLINK) ## ## Our rebuild rules for files that aren't built via the normal mechanisms ## -config/version.c: Makefile - sh $(srcdir)/config/version.sh $(VERSION) > $@ + +## Hard-code the config/version.c target, instead of using $@, so this +## rule works for the distcheck target with Solaris (System V) make. +## distcheck uses VPATH, causes that make to prepend the VPATH to $@. +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) > $@ @@ -538,8 +558,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/arglist.c \ - sbr/base64.c \ - sbr/brkstring.c sbr/check_charset.c sbr/client.c \ + sbr/base64.c sbr/brkstring.c \ + sbr/charstring.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 \ sbr/context_replace.c sbr/context_save.c \ @@ -556,11 +576,13 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/fmt_rfc2047.c sbr/fmt_scan.c \ + sbr/icalparse.y sbr/icalendar.l sbr/datetime.c \ + sbr/lock_file.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_rand.c \ - sbr/makedir.c sbr/message_id.c sbr/mts.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/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 \ @@ -586,10 +608,10 @@ 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 -DNMHETCDIR='"$(sysconfdir)"' \ +sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(nmhetcdir)"' \ -DMAILSPOOL='"$(mailspool)"' \ -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \ - -DNMHLIBDIR='"$(libdir)"' + -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' mts_libmts_a_SOURCES = mts/smtp/smtp.c @@ -607,10 +629,10 @@ $(man_MANS): man/man.sed man/man.sed: Makefile @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED. DO NOT EDIT.,g' > $@ @echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@ + @echo 's,%nmhetcdir%,$(nmhetcdir),g' >> $@ + @echo 's,%nmhlibexecdir%,$(nmhlibexecdir),g' >> $@ @echo 's,%bindir%,$(bindir),g' >> $@ @echo 's,%docdir%,$(docdir),g' >> $@ - @echo 's,%etcdir%,$(sysconfdir),g' >> $@ - @echo 's,%libdir%,$(libdir),g' >> $@ @echo 's,%mandir%,$(mandir),g' >> $@ @echo 's,%mailspool%,$(mailspool),g' >> $@ @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@