Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid warnings

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-04-29 11:23:11 +02:00
parent 84ffbfeb10
commit cf25b55902
4 changed files with 9 additions and 9 deletions

View File

@ -9,7 +9,7 @@
flags_common=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0 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 # 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) cxxflags_common=$(AM_CPPFLAGS) -fno-rtti -fno-exceptions -fno-use-cxa-atexit $(flags_common)
cflags_common=$(INCLUDES) $(flags_common) cflags_common=$(AM_CPPFLAGS) $(flags_common)

View File

@ -16,12 +16,12 @@ if test -z "$newlib_headers"; then
fi fi
newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
INCLUDES="-I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin" AM_CPPFLAGS="-I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin"
INCLUDES="${INCLUDES} -isystem ${cygwin_headers}" AM_CPPFLAGS="${AM_CPPFLAGS} -isystem ${cygwin_headers}"
for h in ${newlib_headers}; do for h in ${newlib_headers}; do
INCLUDES="${INCLUDES} -isystem $h" AM_CPPFLAGS="${AM_CPPFLAGS} -isystem $h"
done done
AC_SUBST(INCLUDES) AC_SUBST(AM_CPPFLAGS)
]) ])
AC_SUBST(target_builddir) AC_SUBST(target_builddir)

View File

@ -13,7 +13,7 @@
# language in the same Makefile. # language in the same Makefile.
override CC = @MINGW_CC@ override CC = @MINGW_CC@
INCLUDES = AM_CPPFLAGS =
noinst_PROGRAMS = cygrun noinst_PROGRAMS = cygrun

View File

@ -11,7 +11,7 @@
# language in the same Makefile. # language in the same Makefile.
override CXX = @MINGW_CXX@ override CXX = @MINGW_CXX@
INCLUDES = AM_CPPFLAGS =
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common