X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9a8d690de3666e648cb70b1301a28a141aeb4ded..da15980c46b05f43c74b5e9ceb250c9f78a288ac:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1b31fa1a..1e6767c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -197,8 +197,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
 
@@ -303,7 +303,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 +610,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 +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)"' \