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-send \
+ test/oauth/test-mhlogin test/oauth/test-mhparam test/oauth/test-send \
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 \
##
## 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/ml docs/contrib/vpick
+dist_docs_contrib_DATA = docs/contrib/replaliases docs/contrib/sendfrom.c
+docs_contrib_PROGRAMS = docs/contrib/sendfrom
##
## Our man pages
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/annosbr.c uip/distsbr.c
uip_viamail_LDADD = $(LDADD) $(POSTLINK)
+##
+## Other program definitions
+##
+
test_getfullname_SOURCES = test/getfullname.c
test_getfullname_LDADD = $(LDADD) $(POSTLINK)
etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c
etc_gen_ctype_checked_LDADD = $(POSTLINK)
+docs_contrib_sendfrom_SOURCES = docs/contrib/sendfrom.c
+docs_contrib_sendfrom_LDADD = $(LDADD) $(TERMLIB) $(CURLLIB) $(POSTLINK)
+
##
## Our rebuild rules for files that aren't built via the normal mechanisms
##
config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
-sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
+sbr_libmh_a_CPPFLAGS = -I./sbr \
+ -DNMHBINDIR='"$(bindir)"' \
+ -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
+ -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
+ -DNMHDOCDIR='"@docdir@"' \
-DMAILSPOOL='"$(mailspool)"' \
- -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
- -DNMHLIBEXECDIR='"$(nmhlibexecdir)"'
+ -DSENDMAILPATH='"$(sendmailpath)"'
mts_libmts_a_SOURCES = mts/smtp/smtp.c