Moved CFLAGS additions to AM_CFLAGS.

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cc0f477baeea2ae8b4a98e984d4f88bf0967b8eb..616d7dd8fcd78adbb313431d854ddffc0208f731 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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.
@@ -635,7 +635,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)"' \