From cf25b559020013e0503c4eead107b9a8225586e6 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 29 Apr 2021 11:23:11 +0200
Subject: [PATCH] Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid
 warnings

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/Makefile.am.common           | 6 +++---
 winsup/acinclude.m4                 | 8 ++++----
 winsup/testsuite/cygrun/Makefile.am | 2 +-
 winsup/utils/mingw/Makefile.am      | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/winsup/Makefile.am.common b/winsup/Makefile.am.common
index 884194df2..0238f65a9 100644
--- a/winsup/Makefile.am.common
+++ b/winsup/Makefile.am.common
@@ -9,7 +9,7 @@
 flags_common=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0
 
 # compiler flags commonly used (but not for MinGW compilation, because they
-# include the Cygwin header paths via @INCLUDES@)
+# include the Cygwin header paths via @AM_CPPFLAGS@)
 
-cxxflags_common=$(INCLUDES) -fno-rtti -fno-exceptions -fno-use-cxa-atexit $(flags_common)
-cflags_common=$(INCLUDES) $(flags_common)
+cxxflags_common=$(AM_CPPFLAGS) -fno-rtti -fno-exceptions -fno-use-cxa-atexit $(flags_common)
+cflags_common=$(AM_CPPFLAGS) $(flags_common)
diff --git a/winsup/acinclude.m4 b/winsup/acinclude.m4
index d34d337e1..7c900d707 100644
--- a/winsup/acinclude.m4
+++ b/winsup/acinclude.m4
@@ -16,12 +16,12 @@ if test -z "$newlib_headers"; then
 fi
 newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
 
-INCLUDES="-I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin"
-INCLUDES="${INCLUDES} -isystem ${cygwin_headers}"
+AM_CPPFLAGS="-I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin"
+AM_CPPFLAGS="${AM_CPPFLAGS} -isystem ${cygwin_headers}"
 for h in ${newlib_headers}; do
-    INCLUDES="${INCLUDES} -isystem $h"
+    AM_CPPFLAGS="${AM_CPPFLAGS} -isystem $h"
 done
-AC_SUBST(INCLUDES)
+AC_SUBST(AM_CPPFLAGS)
 ])
 
 AC_SUBST(target_builddir)
diff --git a/winsup/testsuite/cygrun/Makefile.am b/winsup/testsuite/cygrun/Makefile.am
index eb3b41224..bdbd8f705 100644
--- a/winsup/testsuite/cygrun/Makefile.am
+++ b/winsup/testsuite/cygrun/Makefile.am
@@ -13,7 +13,7 @@
 # language in the same Makefile.
 
 override CC = @MINGW_CC@
-INCLUDES =
+AM_CPPFLAGS =
 
 noinst_PROGRAMS = cygrun
 
diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
index 88882c423..a14725902 100644
--- a/winsup/utils/mingw/Makefile.am
+++ b/winsup/utils/mingw/Makefile.am
@@ -11,7 +11,7 @@
 # language in the same Makefile.
 
 override CXX = @MINGW_CXX@
-INCLUDES =
+AM_CPPFLAGS =
 
 include $(top_srcdir)/Makefile.am.common