public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid warnings
Date: Thu, 29 Apr 2021 09:37:39 +0000 (GMT) [thread overview]
Message-ID: <20210429093739.1886F399243E@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=cf25b559020013e0503c4eead107b9a8225586e6
commit cf25b559020013e0503c4eead107b9a8225586e6
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Thu Apr 29 11:23:11 2021 +0200
Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid warnings
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
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
reply other threads:[~2021-04-29 9:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210429093739.1886F399243E@sourceware.org \
--to=corinna@sourceware.org \
--cc=cygwin-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).