X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9a8d690de3666e648cb70b1301a28a141aeb4ded..b90476d799a2580fbd69e13325c56be5d56e1396:/Makefile.am?ds=inline

diff --git a/Makefile.am b/Makefile.am
index 1b31fa1a..91b53efe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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 \
@@ -78,7 +78,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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 \
@@ -94,7 +94,8 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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 \
@@ -117,8 +118,8 @@ check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
 ## 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"
@@ -197,8 +198,8 @@ 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/netsec.h h/picksbr.h h/popsbr.h
-		 h/prototypes.h h/rcvmail.h h/scansbr.h h/signals.h h/tws.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
 
@@ -240,13 +241,14 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
 ##
 docs_contribdir = $(docdir)/contrib
 dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \
-			    docs/contrib/ml docs/contrib/vpick
+			    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 \
@@ -265,8 +267,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 \
@@ -303,7 +305,7 @@ EXTRA_DIST = autogen.sh config/version.sh sbr/icalparse.h \
 	     test/post/test-post-common.sh test/send/README \
 	     test/oauth/common.sh \
 	     test/valgrind.supp uip/mhmail \
-	     SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS)
+	     SPECS/nmh.spec SPECS/nmh.cygport $(man_SRCS)
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -610,7 +612,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/md5.c sbr/message_id.c \
-		      sbr/mime_type.c sbr/mts.c sbr/norm_charmap.c sbr/path.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/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \
@@ -636,7 +639,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)"' \