aboutsummaryrefslogtreecommitdiff
path: root/newlib
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-12-30 14:26:52 -0500
committerMike Frysinger <vapier@gentoo.org>2022-01-05 20:29:53 -0500
commited20821a4060b28d375b39abd6f6ee33a0b83b81 (patch)
tree4c11a421511e1fb29f985ac5c0ebe7d35ce74e87 /newlib
parent8e71066cb27141dccdf4f09639bfb5f2fb3231d6 (diff)
downloadnewlib-ed20821a4060b28d375b39abd6f6ee33a0b83b81.zip
newlib-ed20821a4060b28d375b39abd6f6ee33a0b83b81.tar.gz
newlib-ed20821a4060b28d375b39abd6f6ee33a0b83b81.tar.bz2
newlib: migrate from INCLUDES to AM_CPPFLAGS
Since automake deprecated the INCLUDES name in favor of AM_CPPFLAGS, change all existing users over. The generated code is the same since the two variables have been used in the same exact places by design. There are other cleanups to be done, but lets focus on just renaming here so we can upgrade to a newer automake version w/out triggering new warnings.
Diffstat (limited to 'newlib')
-rw-r--r--newlib/iconvdata/Makefile.am2
-rw-r--r--newlib/iconvdata/Makefile.in2
-rw-r--r--newlib/libc/argz/Makefile.am2
-rw-r--r--newlib/libc/argz/Makefile.in2
-rw-r--r--newlib/libc/ctype/Makefile.am2
-rw-r--r--newlib/libc/ctype/Makefile.in2
-rw-r--r--newlib/libc/errno/Makefile.am2
-rw-r--r--newlib/libc/errno/Makefile.in2
-rw-r--r--newlib/libc/iconv/Makefile.am2
-rw-r--r--newlib/libc/iconv/Makefile.in2
-rw-r--r--newlib/libc/iconv/ccs/Makefile.am2
-rw-r--r--newlib/libc/iconv/ccs/Makefile.in2
-rw-r--r--newlib/libc/iconv/ces/Makefile.am2
-rw-r--r--newlib/libc/iconv/ces/Makefile.in2
-rw-r--r--newlib/libc/iconv/lib/Makefile.am2
-rw-r--r--newlib/libc/iconv/lib/Makefile.in2
-rw-r--r--newlib/libc/locale/Makefile.am2
-rw-r--r--newlib/libc/locale/Makefile.in2
-rw-r--r--newlib/libc/machine/a29k/Makefile.am4
-rw-r--r--newlib/libc/machine/a29k/Makefile.in4
-rw-r--r--newlib/libc/machine/aarch64/Makefile.am4
-rw-r--r--newlib/libc/machine/aarch64/Makefile.in4
-rw-r--r--newlib/libc/machine/amdgcn/Makefile.am4
-rw-r--r--newlib/libc/machine/amdgcn/Makefile.in4
-rw-r--r--newlib/libc/machine/arc/Makefile.am2
-rw-r--r--newlib/libc/machine/arc/Makefile.in2
-rw-r--r--newlib/libc/machine/arm/Makefile.am4
-rw-r--r--newlib/libc/machine/arm/Makefile.in4
-rw-r--r--newlib/libc/machine/bfin/Makefile.am4
-rw-r--r--newlib/libc/machine/bfin/Makefile.in4
-rw-r--r--newlib/libc/machine/cr16/Makefile.am4
-rw-r--r--newlib/libc/machine/cr16/Makefile.in4
-rw-r--r--newlib/libc/machine/cris/Makefile.am4
-rw-r--r--newlib/libc/machine/cris/Makefile.in4
-rw-r--r--newlib/libc/machine/crx/Makefile.am4
-rw-r--r--newlib/libc/machine/crx/Makefile.in4
-rw-r--r--newlib/libc/machine/csky/Makefile.am4
-rw-r--r--newlib/libc/machine/csky/Makefile.in4
-rw-r--r--newlib/libc/machine/d10v/Makefile.am4
-rw-r--r--newlib/libc/machine/d10v/Makefile.in4
-rw-r--r--newlib/libc/machine/d30v/Makefile.am4
-rw-r--r--newlib/libc/machine/d30v/Makefile.in4
-rw-r--r--newlib/libc/machine/epiphany/Makefile.am4
-rw-r--r--newlib/libc/machine/epiphany/Makefile.in4
-rw-r--r--newlib/libc/machine/fr30/Makefile.am4
-rw-r--r--newlib/libc/machine/fr30/Makefile.in4
-rw-r--r--newlib/libc/machine/frv/Makefile.am4
-rw-r--r--newlib/libc/machine/frv/Makefile.in4
-rw-r--r--newlib/libc/machine/ft32/Makefile.am4
-rw-r--r--newlib/libc/machine/ft32/Makefile.in4
-rw-r--r--newlib/libc/machine/h8300/Makefile.am4
-rw-r--r--newlib/libc/machine/h8300/Makefile.in4
-rw-r--r--newlib/libc/machine/h8500/Makefile.am4
-rw-r--r--newlib/libc/machine/h8500/Makefile.in4
-rw-r--r--newlib/libc/machine/hppa/Makefile.am4
-rw-r--r--newlib/libc/machine/hppa/Makefile.in4
-rw-r--r--newlib/libc/machine/i386/Makefile.am4
-rw-r--r--newlib/libc/machine/i386/Makefile.in4
-rw-r--r--newlib/libc/machine/i960/Makefile.am4
-rw-r--r--newlib/libc/machine/i960/Makefile.in4
-rw-r--r--newlib/libc/machine/iq2000/Makefile.am4
-rw-r--r--newlib/libc/machine/iq2000/Makefile.in4
-rw-r--r--newlib/libc/machine/lm32/Makefile.am4
-rw-r--r--newlib/libc/machine/lm32/Makefile.in4
-rw-r--r--newlib/libc/machine/m32c/Makefile.am4
-rw-r--r--newlib/libc/machine/m32c/Makefile.in4
-rw-r--r--newlib/libc/machine/m32r/Makefile.am4
-rw-r--r--newlib/libc/machine/m32r/Makefile.in4
-rw-r--r--newlib/libc/machine/m68hc11/Makefile.am4
-rw-r--r--newlib/libc/machine/m68hc11/Makefile.in4
-rw-r--r--newlib/libc/machine/m68k/Makefile.am4
-rw-r--r--newlib/libc/machine/m68k/Makefile.in4
-rw-r--r--newlib/libc/machine/m88k/Makefile.am4
-rw-r--r--newlib/libc/machine/m88k/Makefile.in4
-rw-r--r--newlib/libc/machine/mep/Makefile.am4
-rw-r--r--newlib/libc/machine/mep/Makefile.in4
-rw-r--r--newlib/libc/machine/microblaze/Makefile.am4
-rw-r--r--newlib/libc/machine/microblaze/Makefile.in4
-rw-r--r--newlib/libc/machine/mips/Makefile.am4
-rw-r--r--newlib/libc/machine/mips/Makefile.in4
-rw-r--r--newlib/libc/machine/mn10200/Makefile.am4
-rw-r--r--newlib/libc/machine/mn10200/Makefile.in4
-rw-r--r--newlib/libc/machine/mn10300/Makefile.am4
-rw-r--r--newlib/libc/machine/mn10300/Makefile.in4
-rw-r--r--newlib/libc/machine/moxie/Makefile.am4
-rw-r--r--newlib/libc/machine/moxie/Makefile.in4
-rw-r--r--newlib/libc/machine/msp430/Makefile.am4
-rw-r--r--newlib/libc/machine/msp430/Makefile.in4
-rw-r--r--newlib/libc/machine/mt/Makefile.am4
-rw-r--r--newlib/libc/machine/mt/Makefile.in4
-rw-r--r--newlib/libc/machine/nds32/Makefile.am4
-rw-r--r--newlib/libc/machine/nds32/Makefile.in4
-rw-r--r--newlib/libc/machine/necv70/Makefile.am4
-rw-r--r--newlib/libc/machine/necv70/Makefile.in4
-rw-r--r--newlib/libc/machine/nios2/Makefile.am4
-rw-r--r--newlib/libc/machine/nios2/Makefile.in4
-rw-r--r--newlib/libc/machine/nvptx/Makefile.am4
-rw-r--r--newlib/libc/machine/nvptx/Makefile.in4
-rw-r--r--newlib/libc/machine/or1k/Makefile.am4
-rw-r--r--newlib/libc/machine/or1k/Makefile.in4
-rw-r--r--newlib/libc/machine/powerpc/Makefile.am4
-rw-r--r--newlib/libc/machine/powerpc/Makefile.in4
-rw-r--r--newlib/libc/machine/pru/Makefile.am4
-rw-r--r--newlib/libc/machine/pru/Makefile.in4
-rw-r--r--newlib/libc/machine/riscv/Makefile.am4
-rw-r--r--newlib/libc/machine/riscv/Makefile.in4
-rw-r--r--newlib/libc/machine/rl78/Makefile.am4
-rw-r--r--newlib/libc/machine/rl78/Makefile.in4
-rw-r--r--newlib/libc/machine/rx/Makefile.am4
-rw-r--r--newlib/libc/machine/rx/Makefile.in4
-rw-r--r--newlib/libc/machine/sh/Makefile.am4
-rw-r--r--newlib/libc/machine/sh/Makefile.in4
-rw-r--r--newlib/libc/machine/sparc/Makefile.am4
-rw-r--r--newlib/libc/machine/sparc/Makefile.in4
-rw-r--r--newlib/libc/machine/spu/Makefile.am4
-rw-r--r--newlib/libc/machine/spu/Makefile.in4
-rw-r--r--newlib/libc/machine/tic4x/Makefile.am4
-rw-r--r--newlib/libc/machine/tic4x/Makefile.in4
-rw-r--r--newlib/libc/machine/tic6x/Makefile.am4
-rw-r--r--newlib/libc/machine/tic6x/Makefile.in4
-rw-r--r--newlib/libc/machine/tic80/Makefile.am4
-rw-r--r--newlib/libc/machine/tic80/Makefile.in4
-rw-r--r--newlib/libc/machine/v850/Makefile.am4
-rw-r--r--newlib/libc/machine/v850/Makefile.in4
-rw-r--r--newlib/libc/machine/visium/Makefile.am4
-rw-r--r--newlib/libc/machine/visium/Makefile.in4
-rw-r--r--newlib/libc/machine/w65/Makefile.am4
-rw-r--r--newlib/libc/machine/w65/Makefile.in4
-rw-r--r--newlib/libc/machine/x86_64/Makefile.am4
-rw-r--r--newlib/libc/machine/x86_64/Makefile.in4
-rw-r--r--newlib/libc/machine/xc16x/Makefile.am4
-rw-r--r--newlib/libc/machine/xc16x/Makefile.in4
-rw-r--r--newlib/libc/machine/xscale/Makefile.am4
-rw-r--r--newlib/libc/machine/xscale/Makefile.in4
-rw-r--r--newlib/libc/machine/xstormy16/Makefile.am6
-rw-r--r--newlib/libc/machine/xstormy16/Makefile.in6
-rw-r--r--newlib/libc/machine/z8k/Makefile.am4
-rw-r--r--newlib/libc/machine/z8k/Makefile.in4
-rw-r--r--newlib/libc/misc/Makefile.am2
-rw-r--r--newlib/libc/misc/Makefile.in2
-rw-r--r--newlib/libc/posix/Makefile.am2
-rw-r--r--newlib/libc/posix/Makefile.in2
-rw-r--r--newlib/libc/reent/Makefile.am2
-rw-r--r--newlib/libc/reent/Makefile.in2
-rw-r--r--newlib/libc/search/Makefile.am2
-rw-r--r--newlib/libc/search/Makefile.in2
-rw-r--r--newlib/libc/signal/Makefile.am2
-rw-r--r--newlib/libc/signal/Makefile.in2
-rw-r--r--newlib/libc/ssp/Makefile.am2
-rw-r--r--newlib/libc/ssp/Makefile.in2
-rw-r--r--newlib/libc/stdio/Makefile.am2
-rw-r--r--newlib/libc/stdio/Makefile.in2
-rw-r--r--newlib/libc/stdio64/Makefile.am2
-rw-r--r--newlib/libc/stdio64/Makefile.in2
-rw-r--r--newlib/libc/stdlib/Makefile.am2
-rw-r--r--newlib/libc/stdlib/Makefile.in2
-rw-r--r--newlib/libc/string/Makefile.am2
-rw-r--r--newlib/libc/string/Makefile.in2
-rw-r--r--newlib/libc/sys/a29khif/Makefile.am4
-rw-r--r--newlib/libc/sys/a29khif/Makefile.in4
-rw-r--r--newlib/libc/sys/amdgcn/Makefile.am4
-rw-r--r--newlib/libc/sys/amdgcn/Makefile.in4
-rw-r--r--newlib/libc/sys/arm/Makefile.am4
-rw-r--r--newlib/libc/sys/arm/Makefile.in4
-rw-r--r--newlib/libc/sys/d10v/Makefile.am4
-rw-r--r--newlib/libc/sys/d10v/Makefile.in4
-rw-r--r--newlib/libc/sys/decstation/Makefile.am4
-rw-r--r--newlib/libc/sys/decstation/Makefile.in4
-rw-r--r--newlib/libc/sys/epiphany/Makefile.am4
-rw-r--r--newlib/libc/sys/epiphany/Makefile.in4
-rw-r--r--newlib/libc/sys/h8300hms/Makefile.am4
-rw-r--r--newlib/libc/sys/h8300hms/Makefile.in4
-rw-r--r--newlib/libc/sys/h8500hms/Makefile.am4
-rw-r--r--newlib/libc/sys/h8500hms/Makefile.in4
-rw-r--r--newlib/libc/sys/linux/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/argp/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/argp/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/cmath/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/cmath/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/dl/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/dl/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/iconv/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/iconv/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/intl/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/intl/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/linuxthreads/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/linuxthreads/Makefile.in2
-rw-r--r--newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am4
-rw-r--r--newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in4
-rw-r--r--newlib/libc/sys/linux/machine/i386/Makefile.am4
-rw-r--r--newlib/libc/sys/linux/machine/i386/Makefile.in4
-rw-r--r--newlib/libc/sys/linux/net/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/net/Makefile.in2
-rw-r--r--newlib/libc/sys/m88kbug/Makefile.am4
-rw-r--r--newlib/libc/sys/m88kbug/Makefile.in4
-rw-r--r--newlib/libc/sys/mmixware/Makefile.am4
-rw-r--r--newlib/libc/sys/mmixware/Makefile.in4
-rw-r--r--newlib/libc/sys/netware/Makefile.am4
-rw-r--r--newlib/libc/sys/netware/Makefile.in4
-rw-r--r--newlib/libc/sys/or1k/Makefile.am4
-rw-r--r--newlib/libc/sys/or1k/Makefile.in4
-rw-r--r--newlib/libc/sys/phoenix/Makefile.am2
-rw-r--r--newlib/libc/sys/phoenix/Makefile.in2
-rw-r--r--newlib/libc/sys/phoenix/machine/arm/Makefile.am4
-rw-r--r--newlib/libc/sys/phoenix/machine/arm/Makefile.in4
-rw-r--r--newlib/libc/sys/rdos/Makefile.am4
-rw-r--r--newlib/libc/sys/rdos/Makefile.in4
-rw-r--r--newlib/libc/sys/rtems/Makefile.am4
-rw-r--r--newlib/libc/sys/rtems/Makefile.in4
-rw-r--r--newlib/libc/sys/sh/Makefile.am4
-rw-r--r--newlib/libc/sys/sh/Makefile.in4
-rw-r--r--newlib/libc/sys/sparc64/Makefile.am4
-rw-r--r--newlib/libc/sys/sparc64/Makefile.in4
-rw-r--r--newlib/libc/sys/sun4/Makefile.am4
-rw-r--r--newlib/libc/sys/sun4/Makefile.in4
-rw-r--r--newlib/libc/sys/sysmec/Makefile.am4
-rw-r--r--newlib/libc/sys/sysmec/Makefile.in4
-rw-r--r--newlib/libc/sys/sysnec810/Makefile.am4
-rw-r--r--newlib/libc/sys/sysnec810/Makefile.in4
-rw-r--r--newlib/libc/sys/sysnecv850/Makefile.am4
-rw-r--r--newlib/libc/sys/sysnecv850/Makefile.in4
-rw-r--r--newlib/libc/sys/sysvi386/Makefile.am4
-rw-r--r--newlib/libc/sys/sysvi386/Makefile.in4
-rw-r--r--newlib/libc/sys/sysvnecv70/Makefile.am4
-rw-r--r--newlib/libc/sys/sysvnecv70/Makefile.in4
-rw-r--r--newlib/libc/sys/tic80/Makefile.am4
-rw-r--r--newlib/libc/sys/tic80/Makefile.in4
-rw-r--r--newlib/libc/sys/tirtos/Makefile.am4
-rw-r--r--newlib/libc/sys/tirtos/Makefile.in4
-rw-r--r--newlib/libc/sys/w65/Makefile.am4
-rw-r--r--newlib/libc/sys/w65/Makefile.in4
-rw-r--r--newlib/libc/sys/z8ksim/Makefile.am4
-rw-r--r--newlib/libc/sys/z8ksim/Makefile.in4
-rw-r--r--newlib/libc/syscalls/Makefile.am2
-rw-r--r--newlib/libc/syscalls/Makefile.in2
-rw-r--r--newlib/libc/time/Makefile.am2
-rw-r--r--newlib/libc/time/Makefile.in2
-rw-r--r--newlib/libc/unix/Makefile.am2
-rw-r--r--newlib/libc/unix/Makefile.in2
-rw-r--r--newlib/libc/xdr/Makefile.am2
-rw-r--r--newlib/libc/xdr/Makefile.in2
-rw-r--r--newlib/libm/common/Makefile.am2
-rw-r--r--newlib/libm/common/Makefile.in2
-rw-r--r--newlib/libm/complex/Makefile.am2
-rw-r--r--newlib/libm/complex/Makefile.in2
-rw-r--r--newlib/libm/fenv/Makefile.am2
-rw-r--r--newlib/libm/fenv/Makefile.in2
-rw-r--r--newlib/libm/machine/aarch64/Makefile.am2
-rw-r--r--newlib/libm/machine/aarch64/Makefile.in2
-rw-r--r--newlib/libm/machine/arm/Makefile.am2
-rw-r--r--newlib/libm/machine/arm/Makefile.in2
-rw-r--r--newlib/libm/machine/i386/Makefile.am4
-rw-r--r--newlib/libm/machine/i386/Makefile.in4
-rw-r--r--newlib/libm/machine/mips/Makefile.am2
-rw-r--r--newlib/libm/machine/mips/Makefile.in2
-rw-r--r--newlib/libm/machine/nds32/Makefile.am2
-rw-r--r--newlib/libm/machine/nds32/Makefile.in2
-rw-r--r--newlib/libm/machine/powerpc/Makefile.am2
-rw-r--r--newlib/libm/machine/powerpc/Makefile.in2
-rw-r--r--newlib/libm/machine/pru/Makefile.am2
-rw-r--r--newlib/libm/machine/pru/Makefile.in2
-rw-r--r--newlib/libm/machine/riscv/Makefile.am2
-rw-r--r--newlib/libm/machine/riscv/Makefile.in2
-rw-r--r--newlib/libm/machine/sparc/Makefile.am2
-rw-r--r--newlib/libm/machine/sparc/Makefile.in2
-rw-r--r--newlib/libm/machine/spu/Makefile.am2
-rw-r--r--newlib/libm/machine/spu/Makefile.in2
-rw-r--r--newlib/libm/machine/x86_64/Makefile.am2
-rw-r--r--newlib/libm/machine/x86_64/Makefile.in2
-rw-r--r--newlib/libm/math/Makefile.am2
-rw-r--r--newlib/libm/math/Makefile.in2
-rw-r--r--newlib/libm/mathfp/Makefile.am2
-rw-r--r--newlib/libm/mathfp/Makefile.in2
274 files changed, 454 insertions, 454 deletions
diff --git a/newlib/iconvdata/Makefile.am b/newlib/iconvdata/Makefile.am
index ba72ccb..a4c056b 100644
--- a/newlib/iconvdata/Makefile.am
+++ b/newlib/iconvdata/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
if ELIX_LEVEL_1
LIB_OBJS =
diff --git a/newlib/iconvdata/Makefile.in b/newlib/iconvdata/Makefile.in
index e4d9937..c7be773 100644
--- a/newlib/iconvdata/Makefile.in
+++ b/newlib/iconvdata/Makefile.in
@@ -269,7 +269,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
@ELIX_LEVEL_1_FALSE@LIB_OBJS = euc-jp.$(oext) jis0201.$(oext) jis0208.$(oext) jis0212.$(oext)
@ELIX_LEVEL_1_TRUE@LIB_OBJS =
AM_CFLAGS = -DNDEBUG
diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am
index 90df56a..0f73cd2 100644
--- a/newlib/libc/argz/Makefile.am
+++ b/newlib/libc/argz/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
## All functions in this directory are EL/IX level 2 and above
if ELIX_LEVEL_1
diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in
index 14b7541..a0f6615 100644
--- a/newlib/libc/argz/Makefile.in
+++ b/newlib/libc/argz/Makefile.in
@@ -297,7 +297,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = \
@ELIX_LEVEL_1_FALSE@ argz_add.c \
@ELIX_LEVEL_1_FALSE@ argz_add_sep.c \
diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index 345406f..447b7af 100644
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
ctype_.c \
diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in
index 5fc2315..54c533d 100644
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -355,7 +355,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
ctype_.c \
isalnum.c \
diff --git a/newlib/libc/errno/Makefile.am b/newlib/libc/errno/Makefile.am
index 9713d7c..77a0b8b 100644
--- a/newlib/libc/errno/Makefile.am
+++ b/newlib/libc/errno/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = errno.c
diff --git a/newlib/libc/errno/Makefile.in b/newlib/libc/errno/Makefile.in
index cf4253a..502da2c 100644
--- a/newlib/libc/errno/Makefile.in
+++ b/newlib/libc/errno/Makefile.in
@@ -270,7 +270,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = errno.c
liberrno_la_LDFLAGS = -Xcompiler -nostdlib
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liberrno.la
diff --git a/newlib/libc/iconv/Makefile.am b/newlib/libc/iconv/Makefile.am
index b8353be..4123c7a 100644
--- a/newlib/libc/iconv/Makefile.am
+++ b/newlib/libc/iconv/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = ces ccs lib .
cctdir=$(datadir)/iconv_data
cct_DATA=encoding.aliases
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
SUBDEFS = lib/stmp-def
diff --git a/newlib/libc/iconv/Makefile.in b/newlib/libc/iconv/Makefile.in
index 0e5a0f1..0613b16 100644
--- a/newlib/libc/iconv/Makefile.in
+++ b/newlib/libc/iconv/Makefile.in
@@ -272,7 +272,7 @@ top_srcdir = @top_srcdir@
SUBDIRS = ces ccs lib .
cctdir = $(datadir)/iconv_data
cct_DATA = encoding.aliases
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
SUBDEFS = lib/stmp-def
#
diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
index 22913b4..f87d072 100644
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ b/newlib/libc/iconv/ccs/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = ccsbi.c \
iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c \
diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in
index f89a2c1..bbe2805 100644
--- a/newlib/libc/iconv/ccs/Makefile.in
+++ b/newlib/libc/iconv/ccs/Makefile.in
@@ -332,7 +332,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = ccsbi.c \
iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c \
iso_8859_1.c iso_8859_2.c iso_8859_3.c iso_8859_4.c \
diff --git a/newlib/libc/iconv/ces/Makefile.am b/newlib/libc/iconv/ces/Makefile.am
index 46be1ef..21a37b7 100644
--- a/newlib/libc/iconv/ces/Makefile.am
+++ b/newlib/libc/iconv/ces/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
utf-8.c \
diff --git a/newlib/libc/iconv/ces/Makefile.in b/newlib/libc/iconv/ces/Makefile.in
index 42e2b8e..2983f9a 100644
--- a/newlib/libc/iconv/ces/Makefile.in
+++ b/newlib/libc/iconv/ces/Makefile.in
@@ -275,7 +275,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
utf-8.c \
utf-16.c \
diff --git a/newlib/libc/iconv/lib/Makefile.am b/newlib/libc/iconv/lib/Makefile.am
index 3e3b806..4e49557 100644
--- a/newlib/libc/iconv/lib/Makefile.am
+++ b/newlib/libc/iconv/lib/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
aliasesi.c \
diff --git a/newlib/libc/iconv/lib/Makefile.in b/newlib/libc/iconv/lib/Makefile.in
index c7fe085..68aface 100644
--- a/newlib/libc/iconv/lib/Makefile.in
+++ b/newlib/libc/iconv/lib/Makefile.in
@@ -268,7 +268,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
aliasesi.c \
ucsconv.c \
diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am
index c91a374..1fd2530 100644
--- a/newlib/libc/locale/Makefile.am
+++ b/newlib/libc/locale/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = setlocale.h locale.c localeconv.c
diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in
index 58e570d..53d4bd5 100644
--- a/newlib/libc/locale/Makefile.in
+++ b/newlib/libc/locale/Makefile.in
@@ -286,7 +286,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = setlocale.h locale.c localeconv.c
@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = \
@ELIX_LEVEL_1_FALSE@ duplocale.c \
diff --git a/newlib/libc/machine/a29k/Makefile.am b/newlib/libc/machine/a29k/Makefile.am
index d3dd753..cce84e0 100644
--- a/newlib/libc/machine/a29k/Makefile.am
+++ b/newlib/libc/machine/a29k/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/a29k/Makefile.in b/newlib/libc/machine/a29k/Makefile.in
index da43086..d183a82 100644
--- a/newlib/libc/machine/a29k/Makefile.in
+++ b/newlib/libc/machine/a29k/Makefile.in
@@ -204,8 +204,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES =
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/aarch64/Makefile.am b/newlib/libc/machine/aarch64/Makefile.am
index ca7c790..9b8f6a8 100644
--- a/newlib/libc/machine/aarch64/Makefile.am
+++ b/newlib/libc/machine/aarch64/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/aarch64/Makefile.in b/newlib/libc/machine/aarch64/Makefile.in
index c854a1b..d1865b6 100644
--- a/newlib/libc/machine/aarch64/Makefile.in
+++ b/newlib/libc/machine/aarch64/Makefile.in
@@ -229,8 +229,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = memchr-stub.c memchr.S memcmp-stub.c memcmp.S \
memcpy-stub.c memcpy.S memmove-stub.c memmove.S memset-stub.c \
diff --git a/newlib/libc/machine/amdgcn/Makefile.am b/newlib/libc/machine/amdgcn/Makefile.am
index accde81..e6930cf 100644
--- a/newlib/libc/machine/amdgcn/Makefile.am
+++ b/newlib/libc/machine/amdgcn/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/amdgcn/Makefile.in b/newlib/libc/machine/amdgcn/Makefile.in
index c2a37c7..7d04832 100644
--- a/newlib/libc/machine/amdgcn/Makefile.in
+++ b/newlib/libc/machine/amdgcn/Makefile.in
@@ -211,8 +211,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = abort.c exit.c atexit.c malloc_support.c getreent.c signal.c
lib_a_CFLAGS = $(AM_CFLAGS)
diff --git a/newlib/libc/machine/arc/Makefile.am b/newlib/libc/machine/arc/Makefile.am
index fe477bf..1c44c8b 100644
--- a/newlib/libc/machine/arc/Makefile.am
+++ b/newlib/libc/machine/arc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/arc/Makefile.in b/newlib/libc/machine/arc/Makefile.in
index 2391975..65b1d86 100644
--- a/newlib/libc/machine/arc/Makefile.in
+++ b/newlib/libc/machine/arc/Makefile.in
@@ -229,7 +229,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = \
memcmp.S \
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index 2d55946..967850e 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
index 17a46a4..aedf6bb 100644
--- a/newlib/libc/machine/arm/Makefile.in
+++ b/newlib/libc/machine/arm/Makefile.in
@@ -224,8 +224,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strcmp.S strcpy.c aeabi_memcpy.c \
aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
diff --git a/newlib/libc/machine/bfin/Makefile.am b/newlib/libc/machine/bfin/Makefile.am
index c62a35d..72ce491 100644
--- a/newlib/libc/machine/bfin/Makefile.am
+++ b/newlib/libc/machine/bfin/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/bfin/Makefile.in b/newlib/libc/machine/bfin/Makefile.in
index 8e66de6..c62cb5a 100644
--- a/newlib/libc/machine/bfin/Makefile.in
+++ b/newlib/libc/machine/bfin/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S longjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/cr16/Makefile.am b/newlib/libc/machine/cr16/Makefile.am
index d8c0335..493d2d6 100644
--- a/newlib/libc/machine/cr16/Makefile.am
+++ b/newlib/libc/machine/cr16/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/cr16/Makefile.in b/newlib/libc/machine/cr16/Makefile.in
index ab62313..7503fec 100644
--- a/newlib/libc/machine/cr16/Makefile.in
+++ b/newlib/libc/machine/cr16/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S getenv.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
index 95085a1..67287ae 100644
--- a/newlib/libc/machine/cris/Makefile.am
+++ b/newlib/libc/machine/cris/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/cris/Makefile.in b/newlib/libc/machine/cris/Makefile.in
index 5ddadfc..19b3172 100644
--- a/newlib/libc/machine/cris/Makefile.in
+++ b/newlib/libc/machine/cris/Makefile.in
@@ -245,8 +245,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
# We also make a library with just the useful
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
index d8c0335..493d2d6 100644
--- a/newlib/libc/machine/crx/Makefile.am
+++ b/newlib/libc/machine/crx/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/crx/Makefile.in b/newlib/libc/machine/crx/Makefile.in
index ab62313..7503fec 100644
--- a/newlib/libc/machine/crx/Makefile.in
+++ b/newlib/libc/machine/crx/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S getenv.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/csky/Makefile.am b/newlib/libc/machine/csky/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/csky/Makefile.am
+++ b/newlib/libc/machine/csky/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/csky/Makefile.in b/newlib/libc/machine/csky/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/csky/Makefile.in
+++ b/newlib/libc/machine/csky/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/d10v/Makefile.am b/newlib/libc/machine/d10v/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/d10v/Makefile.am
+++ b/newlib/libc/machine/d10v/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/d10v/Makefile.in b/newlib/libc/machine/d10v/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/d10v/Makefile.in
+++ b/newlib/libc/machine/d10v/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/d30v/Makefile.am b/newlib/libc/machine/d30v/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/d30v/Makefile.am
+++ b/newlib/libc/machine/d30v/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/d30v/Makefile.in b/newlib/libc/machine/d30v/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/d30v/Makefile.in
+++ b/newlib/libc/machine/d30v/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/epiphany/Makefile.am b/newlib/libc/machine/epiphany/Makefile.am
index 8c09470..e83939a 100644
--- a/newlib/libc/machine/epiphany/Makefile.am
+++ b/newlib/libc/machine/epiphany/Makefile.am
@@ -26,9 +26,9 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/epiphany/Makefile.in b/newlib/libc/machine/epiphany/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/epiphany/Makefile.in
+++ b/newlib/libc/machine/epiphany/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/fr30/Makefile.am b/newlib/libc/machine/fr30/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/fr30/Makefile.am
+++ b/newlib/libc/machine/fr30/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/fr30/Makefile.in b/newlib/libc/machine/fr30/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/fr30/Makefile.in
+++ b/newlib/libc/machine/fr30/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/frv/Makefile.am b/newlib/libc/machine/frv/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/frv/Makefile.am
+++ b/newlib/libc/machine/frv/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/frv/Makefile.in b/newlib/libc/machine/frv/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/frv/Makefile.in
+++ b/newlib/libc/machine/frv/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/ft32/Makefile.am b/newlib/libc/machine/ft32/Makefile.am
index 3d9ec9c..a087263 100644
--- a/newlib/libc/machine/ft32/Makefile.am
+++ b/newlib/libc/machine/ft32/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/ft32/Makefile.in b/newlib/libc/machine/ft32/Makefile.in
index 77bd086..35555db 100644
--- a/newlib/libc/machine/ft32/Makefile.in
+++ b/newlib/libc/machine/ft32/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strlen.S memcpy.S strcmp.S memset.S strcpy.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/h8300/Makefile.am b/newlib/libc/machine/h8300/Makefile.am
index 2d394ae..8f34127 100644
--- a/newlib/libc/machine/h8300/Makefile.am
+++ b/newlib/libc/machine/h8300/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/h8300/Makefile.in b/newlib/libc/machine/h8300/Makefile.in
index c11a026..db10911 100644
--- a/newlib/libc/machine/h8300/Makefile.in
+++ b/newlib/libc/machine/h8300/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = reg_memcpy.S reg_memset.S strcmp.S memcpy.S memset.S \
setjmp.S h8sx_strcpy.S
diff --git a/newlib/libc/machine/h8500/Makefile.am b/newlib/libc/machine/h8500/Makefile.am
index 9d65947..8283a58 100644
--- a/newlib/libc/machine/h8500/Makefile.am
+++ b/newlib/libc/machine/h8500/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/h8500/Makefile.in b/newlib/libc/machine/h8500/Makefile.in
index 8497745..ce1bef5 100644
--- a/newlib/libc/machine/h8500/Makefile.in
+++ b/newlib/libc/machine/h8500/Makefile.in
@@ -217,8 +217,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = divsi3.c mulsi3.c divhi3.S shifts.c cmpsi.c psi.S setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/hppa/Makefile.am b/newlib/libc/machine/hppa/Makefile.am
index 86ce650..976a557 100644
--- a/newlib/libc/machine/hppa/Makefile.am
+++ b/newlib/libc/machine/hppa/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/hppa/Makefile.in b/newlib/libc/machine/hppa/Makefile.in
index f0a466d..d42474a 100644
--- a/newlib/libc/machine/hppa/Makefile.in
+++ b/newlib/libc/machine/hppa/Makefile.in
@@ -219,8 +219,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = \
memchr.S memcmp.S memcpy.S memset.S setjmp.S strcat.S strcmp.S \
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index 6194881..010df04 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
if MACH_ADD_SETJMP
ADDED_SOURCES = setjmp.S
diff --git a/newlib/libc/machine/i386/Makefile.in b/newlib/libc/machine/i386/Makefile.in
index 2b8ba3e..d83197d 100644
--- a/newlib/libc/machine/i386/Makefile.in
+++ b/newlib/libc/machine/i386/Makefile.in
@@ -271,8 +271,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
@MACH_ADD_SETJMP_FALSE@ADDED_SOURCES =
@MACH_ADD_SETJMP_TRUE@ADDED_SOURCES = setjmp.S
LIB_SOURCES = \
diff --git a/newlib/libc/machine/i960/Makefile.am b/newlib/libc/machine/i960/Makefile.am
index d0421db..abd4c08 100644
--- a/newlib/libc/machine/i960/Makefile.am
+++ b/newlib/libc/machine/i960/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/i960/Makefile.in b/newlib/libc/machine/i960/Makefile.in
index 6430ff4..b3eb8b9 100644
--- a/newlib/libc/machine/i960/Makefile.in
+++ b/newlib/libc/machine/i960/Makefile.in
@@ -204,8 +204,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES =
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/iq2000/Makefile.am b/newlib/libc/machine/iq2000/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/iq2000/Makefile.am
+++ b/newlib/libc/machine/iq2000/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/iq2000/Makefile.in b/newlib/libc/machine/iq2000/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/iq2000/Makefile.in
+++ b/newlib/libc/machine/iq2000/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/lm32/Makefile.am b/newlib/libc/machine/lm32/Makefile.am
index 20be1dd..2ac0d1f 100644
--- a/newlib/libc/machine/lm32/Makefile.am
+++ b/newlib/libc/machine/lm32/Makefile.am
@@ -1,10 +1,10 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS=$(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/lm32/Makefile.in b/newlib/libc/machine/lm32/Makefile.in
index 56330eb..1a63b11 100644
--- a/newlib/libc/machine/lm32/Makefile.in
+++ b/newlib/libc/machine/lm32/Makefile.in
@@ -214,9 +214,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
lib_a_CFLAGS = $(AM_CFLAGS)
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/m32c/Makefile.am
+++ b/newlib/libc/machine/m32c/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m32c/Makefile.in b/newlib/libc/machine/m32c/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/m32c/Makefile.in
+++ b/newlib/libc/machine/m32c/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/m32r/Makefile.am b/newlib/libc/machine/m32r/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/m32r/Makefile.am
+++ b/newlib/libc/machine/m32r/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m32r/Makefile.in b/newlib/libc/machine/m32r/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/m32r/Makefile.in
+++ b/newlib/libc/machine/m32r/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/m68hc11/Makefile.am b/newlib/libc/machine/m68hc11/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/m68hc11/Makefile.am
+++ b/newlib/libc/machine/m68hc11/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m68hc11/Makefile.in b/newlib/libc/machine/m68hc11/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/m68hc11/Makefile.in
+++ b/newlib/libc/machine/m68hc11/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/m68k/Makefile.am b/newlib/libc/machine/m68k/Makefile.am
index 08e1cf1..792fb51 100644
--- a/newlib/libc/machine/m68k/Makefile.am
+++ b/newlib/libc/machine/m68k/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m68k/Makefile.in b/newlib/libc/machine/m68k/Makefile.in
index d59d60f..e5a9a8c 100644
--- a/newlib/libc/machine/m68k/Makefile.in
+++ b/newlib/libc/machine/m68k/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strcpy.c strlen.c memcpy.S memset.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/m88k/Makefile.am b/newlib/libc/machine/m88k/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/m88k/Makefile.am
+++ b/newlib/libc/machine/m88k/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m88k/Makefile.in b/newlib/libc/machine/m88k/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/m88k/Makefile.in
+++ b/newlib/libc/machine/m88k/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/mep/Makefile.am b/newlib/libc/machine/mep/Makefile.am
index 68a7b15..282de80 100644
--- a/newlib/libc/machine/mep/Makefile.am
+++ b/newlib/libc/machine/mep/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/mep/Makefile.in b/newlib/libc/machine/mep/Makefile.in
index dcd6037..8711703 100644
--- a/newlib/libc/machine/mep/Makefile.in
+++ b/newlib/libc/machine/mep/Makefile.in
@@ -211,8 +211,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
diff --git a/newlib/libc/machine/microblaze/Makefile.am b/newlib/libc/machine/microblaze/Makefile.am
index 4b43cd1..2eca210 100644
--- a/newlib/libc/machine/microblaze/Makefile.am
+++ b/newlib/libc/machine/microblaze/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/microblaze/Makefile.in b/newlib/libc/machine/microblaze/Makefile.in
index b595542..cc9be2b 100644
--- a/newlib/libc/machine/microblaze/Makefile.in
+++ b/newlib/libc/machine/microblaze/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = strlen.c strcmp.c strcpy.c setjmp.S longjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/mips/Makefile.am b/newlib/libc/machine/mips/Makefile.am
index fd2dedd..6ce9d4a 100644
--- a/newlib/libc/machine/mips/Makefile.am
+++ b/newlib/libc/machine/mips/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/mips/Makefile.in b/newlib/libc/machine/mips/Makefile.in
index 83463d9..6cfad3a 100644
--- a/newlib/libc/machine/mips/Makefile.in
+++ b/newlib/libc/machine/mips/Makefile.in
@@ -212,8 +212,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strlen.c strcmp.S strncpy.c memset.S memcpy.S
ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
diff --git a/newlib/libc/machine/mn10200/Makefile.am b/newlib/libc/machine/mn10200/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/mn10200/Makefile.am
+++ b/newlib/libc/machine/mn10200/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/mn10200/Makefile.in b/newlib/libc/machine/mn10200/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/mn10200/Makefile.in
+++ b/newlib/libc/machine/mn10200/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/mn10300/Makefile.am b/newlib/libc/machine/mn10300/Makefile.am
index 5dd7f63..4dd5a1d 100644
--- a/newlib/libc/machine/mn10300/Makefile.am
+++ b/newlib/libc/machine/mn10300/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/mn10300/Makefile.in b/newlib/libc/machine/mn10300/Makefile.in
index 1c4112e..887c7d8 100644
--- a/newlib/libc/machine/mn10300/Makefile.in
+++ b/newlib/libc/machine/mn10300/Makefile.in
@@ -218,8 +218,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S memchr.S memcmp.S memcpy.S memset.S strchr.S \
strcmp.S strcpy.S strlen.S
diff --git a/newlib/libc/machine/moxie/Makefile.am b/newlib/libc/machine/moxie/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/moxie/Makefile.am
+++ b/newlib/libc/machine/moxie/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/moxie/Makefile.in b/newlib/libc/machine/moxie/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/moxie/Makefile.in
+++ b/newlib/libc/machine/moxie/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/msp430/Makefile.am b/newlib/libc/machine/msp430/Makefile.am
index f253402..57f4796 100644
--- a/newlib/libc/machine/msp430/Makefile.am
+++ b/newlib/libc/machine/msp430/Makefile.am
@@ -13,9 +13,9 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/msp430/Makefile.in b/newlib/libc/machine/msp430/Makefile.in
index f20d173..ff439c8 100644
--- a/newlib/libc/machine/msp430/Makefile.in
+++ b/newlib/libc/machine/msp430/Makefile.in
@@ -230,8 +230,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S $(TINY_SOURCES)
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/mt/Makefile.am
+++ b/newlib/libc/machine/mt/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/mt/Makefile.in b/newlib/libc/machine/mt/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/mt/Makefile.in
+++ b/newlib/libc/machine/mt/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/nds32/Makefile.am b/newlib/libc/machine/nds32/Makefile.am
index b75c41f..cd8f716 100644
--- a/newlib/libc/machine/nds32/Makefile.am
+++ b/newlib/libc/machine/nds32/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/nds32/Makefile.in b/newlib/libc/machine/nds32/Makefile.in
index b9ccc77..2b8bfef 100644
--- a/newlib/libc/machine/nds32/Makefile.in
+++ b/newlib/libc/machine/nds32/Makefile.in
@@ -227,8 +227,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
@IS_NDS32_ISA_V3M_FALSE@lib_a_SOURCES = abort.c memcpy.S memset.S setjmp.S strcmp.S strcpy.S
@IS_NDS32_ISA_V3M_TRUE@lib_a_SOURCES = abort.c setjmp.S strcmp.S strcpy.S
diff --git a/newlib/libc/machine/necv70/Makefile.am b/newlib/libc/machine/necv70/Makefile.am
index ea804a1..4652a8a 100644
--- a/newlib/libc/machine/necv70/Makefile.am
+++ b/newlib/libc/machine/necv70/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/necv70/Makefile.in b/newlib/libc/machine/necv70/Makefile.in
index 66391d3..77aee3c 100644
--- a/newlib/libc/machine/necv70/Makefile.in
+++ b/newlib/libc/machine/necv70/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = fastmath.S setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/nios2/Makefile.am b/newlib/libc/machine/nios2/Makefile.am
index 805640f..b11dcf8 100644
--- a/newlib/libc/machine/nios2/Makefile.am
+++ b/newlib/libc/machine/nios2/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/nios2/Makefile.in b/newlib/libc/machine/nios2/Makefile.in
index 585dd54..09e4afb 100644
--- a/newlib/libc/machine/nios2/Makefile.in
+++ b/newlib/libc/machine/nios2/Makefile.in
@@ -213,8 +213,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.s
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/nvptx/Makefile.am b/newlib/libc/machine/nvptx/Makefile.am
index 86d8d03..ef0d239 100644
--- a/newlib/libc/machine/nvptx/Makefile.am
+++ b/newlib/libc/machine/nvptx/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/nvptx/Makefile.in b/newlib/libc/machine/nvptx/Makefile.in
index 28bc5e9..96a8f31 100644
--- a/newlib/libc/machine/nvptx/Makefile.in
+++ b/newlib/libc/machine/nvptx/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = calloc.c callocr.c malloc.c mallocr.c realloc.c reallocr.c \
free.c write.c assert.c puts.c putchar.c printf.c abort.c \
diff --git a/newlib/libc/machine/or1k/Makefile.am b/newlib/libc/machine/or1k/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/or1k/Makefile.am
+++ b/newlib/libc/machine/or1k/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/or1k/Makefile.in b/newlib/libc/machine/or1k/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/or1k/Makefile.in
+++ b/newlib/libc/machine/or1k/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
index 577b7f9..97a1b3d 100644
--- a/newlib/libc/machine/powerpc/Makefile.am
+++ b/newlib/libc/machine/powerpc/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in
index 46acda6..30a3a6d 100644
--- a/newlib/libc/machine/powerpc/Makefile.in
+++ b/newlib/libc/machine/powerpc/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
lib_a_SOURCES = setjmp.S
diff --git a/newlib/libc/machine/pru/Makefile.am b/newlib/libc/machine/pru/Makefile.am
index 805640f..b11dcf8 100644
--- a/newlib/libc/machine/pru/Makefile.am
+++ b/newlib/libc/machine/pru/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/pru/Makefile.in b/newlib/libc/machine/pru/Makefile.in
index 585dd54..09e4afb 100644
--- a/newlib/libc/machine/pru/Makefile.in
+++ b/newlib/libc/machine/pru/Makefile.in
@@ -213,8 +213,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.s
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/riscv/Makefile.am b/newlib/libc/machine/riscv/Makefile.am
index a35144b..0ff38e7 100644
--- a/newlib/libc/machine/riscv/Makefile.am
+++ b/newlib/libc/machine/riscv/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/riscv/Makefile.in b/newlib/libc/machine/riscv/Makefile.in
index e9a8072..df20558 100644
--- a/newlib/libc/machine/riscv/Makefile.in
+++ b/newlib/libc/machine/riscv/Makefile.in
@@ -219,8 +219,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = memmove.S memmove-stub.c memset.S memcpy-asm.S memcpy.c strlen.c \
strcpy.c strcmp.S setjmp.S ieeefp.c ffs.c
diff --git a/newlib/libc/machine/rl78/Makefile.am b/newlib/libc/machine/rl78/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/rl78/Makefile.am
+++ b/newlib/libc/machine/rl78/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/rl78/Makefile.in b/newlib/libc/machine/rl78/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/rl78/Makefile.in
+++ b/newlib/libc/machine/rl78/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/rx/Makefile.am b/newlib/libc/machine/rx/Makefile.am
index 14bc7a9..137c46c 100644
--- a/newlib/libc/machine/rx/Makefile.am
+++ b/newlib/libc/machine/rx/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/rx/Makefile.in b/newlib/libc/machine/rx/Makefile.in
index 3ff0a85..15ba70d 100644
--- a/newlib/libc/machine/rx/Makefile.in
+++ b/newlib/libc/machine/rx/Makefile.in
@@ -220,8 +220,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S \
strncmp.S strcmp.S strncpy.S strcpy.S strlen.S strcat.S strncat.S \
diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am
index 73eb60d..74fb4bc 100644
--- a/newlib/libc/machine/sh/Makefile.am
+++ b/newlib/libc/machine/sh/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/sh/Makefile.in b/newlib/libc/machine/sh/Makefile.in
index 1b353ab..3b9c04d 100644
--- a/newlib/libc/machine/sh/Makefile.in
+++ b/newlib/libc/machine/sh/Makefile.in
@@ -228,8 +228,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
@SH64_FALSE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S
@SH64_TRUE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S strncpy.S
diff --git a/newlib/libc/machine/sparc/Makefile.am b/newlib/libc/machine/sparc/Makefile.am
index 7a93a35..a0fb59a 100644
--- a/newlib/libc/machine/sparc/Makefile.am
+++ b/newlib/libc/machine/sparc/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/sparc/Makefile.in b/newlib/libc/machine/sparc/Makefile.in
index bddf7ec..b3687f7 100644
--- a/newlib/libc/machine/sparc/Makefile.in
+++ b/newlib/libc/machine/sparc/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = scan.c shuffle.c setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/spu/Makefile.am b/newlib/libc/machine/spu/Makefile.am
index 1d36daa..fd79f4b 100644
--- a/newlib/libc/machine/spu/Makefile.am
+++ b/newlib/libc/machine/spu/Makefile.am
@@ -1,10 +1,10 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
lib_a_SOURCES = setjmp.S assert.c clearerr.c creat.c fclose.c feof.c \
ferror.c fflush.c fgetc.c fgetpos.c fgets.c fileno.c fiprintf.S \
diff --git a/newlib/libc/machine/spu/Makefile.in b/newlib/libc/machine/spu/Makefile.in
index 9f20602..ae0c0ea 100644
--- a/newlib/libc/machine/spu/Makefile.in
+++ b/newlib/libc/machine/spu/Makefile.in
@@ -305,9 +305,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
lib_a_SOURCES = setjmp.S assert.c clearerr.c creat.c fclose.c feof.c \
ferror.c fflush.c fgetc.c fgetpos.c fgets.c fileno.c \
fiprintf.S fiscanf.S fopen.c fprintf.S fputc.c fputs.c fread.c \
diff --git a/newlib/libc/machine/tic4x/Makefile.am b/newlib/libc/machine/tic4x/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/tic4x/Makefile.am
+++ b/newlib/libc/machine/tic4x/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/tic4x/Makefile.in b/newlib/libc/machine/tic4x/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/tic4x/Makefile.in
+++ b/newlib/libc/machine/tic4x/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/tic6x/Makefile.am b/newlib/libc/machine/tic6x/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/tic6x/Makefile.am
+++ b/newlib/libc/machine/tic6x/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/tic6x/Makefile.in b/newlib/libc/machine/tic6x/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/tic6x/Makefile.in
+++ b/newlib/libc/machine/tic6x/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/tic80/Makefile.am b/newlib/libc/machine/tic80/Makefile.am
index 20c9013..f94b393 100644
--- a/newlib/libc/machine/tic80/Makefile.am
+++ b/newlib/libc/machine/tic80/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/tic80/Makefile.in b/newlib/libc/machine/tic80/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/tic80/Makefile.in
+++ b/newlib/libc/machine/tic80/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/v850/Makefile.am b/newlib/libc/machine/v850/Makefile.am
index 46d0cab..c0f5ebe 100644
--- a/newlib/libc/machine/v850/Makefile.am
+++ b/newlib/libc/machine/v850/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/v850/Makefile.in b/newlib/libc/machine/v850/Makefile.in
index e2a8c76..d6570a9 100644
--- a/newlib/libc/machine/v850/Makefile.in
+++ b/newlib/libc/machine/v850/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/visium/Makefile.am b/newlib/libc/machine/visium/Makefile.am
index 1d9525b..b45087a 100644
--- a/newlib/libc/machine/visium/Makefile.am
+++ b/newlib/libc/machine/visium/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/visium/Makefile.in b/newlib/libc/machine/visium/Makefile.in
index 2c8505f..3f3c16f 100644
--- a/newlib/libc/machine/visium/Makefile.in
+++ b/newlib/libc/machine/visium/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = memcpy.c memset.c memmove.c setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
diff --git a/newlib/libc/machine/w65/Makefile.am b/newlib/libc/machine/w65/Makefile.am
index e0a72c0..9aaa933 100644
--- a/newlib/libc/machine/w65/Makefile.am
+++ b/newlib/libc/machine/w65/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/w65/Makefile.in b/newlib/libc/machine/w65/Makefile.in
index 82dcd0c..2105c75 100644
--- a/newlib/libc/machine/w65/Makefile.in
+++ b/newlib/libc/machine/w65/Makefile.in
@@ -217,8 +217,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = udivhi3.S umodhi3.S smulhi3.S lshrhi.S sdivhi3.S mulsi3.c \
divsi3.c cmpsi.c
diff --git a/newlib/libc/machine/x86_64/Makefile.am b/newlib/libc/machine/x86_64/Makefile.am
index 890d1ca..096b896 100644
--- a/newlib/libc/machine/x86_64/Makefile.am
+++ b/newlib/libc/machine/x86_64/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/x86_64/Makefile.in b/newlib/libc/machine/x86_64/Makefile.in
index b837935..c77a2e6 100644
--- a/newlib/libc/machine/x86_64/Makefile.in
+++ b/newlib/libc/machine/x86_64/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S memcpy.S memset.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/xc16x/Makefile.am b/newlib/libc/machine/xc16x/Makefile.am
index 1a14b59..03fc79f 100644
--- a/newlib/libc/machine/xc16x/Makefile.am
+++ b/newlib/libc/machine/xc16x/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/xc16x/Makefile.in b/newlib/libc/machine/xc16x/Makefile.in
index 37c1bbf..6eaf375 100644
--- a/newlib/libc/machine/xc16x/Makefile.in
+++ b/newlib/libc/machine/xc16x/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S puts.c putchar.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/xscale/Makefile.am b/newlib/libc/machine/xscale/Makefile.am
index 3b9812e..e8a9d53 100644
--- a/newlib/libc/machine/xscale/Makefile.am
+++ b/newlib/libc/machine/xscale/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/xscale/Makefile.in b/newlib/libc/machine/xscale/Makefile.in
index 3006030..756c10e 100644
--- a/newlib/libc/machine/xscale/Makefile.in
+++ b/newlib/libc/machine/xscale/Makefile.in
@@ -218,8 +218,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = \
memchr.c memcmp.c memcpy.c memmove.c memset.c \
diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am
index ee508e7..9e60bc5 100644
--- a/newlib/libc/machine/xstormy16/Makefile.am
+++ b/newlib/libc/machine/xstormy16/Makefile.am
@@ -1,10 +1,10 @@
## Process this file with automake to generate Makefile.in
-# hack: putting $(newlib_basedir)/libm/common into INCLUDES forces automake
+# hack: putting $(newlib_basedir)/libm/common into AM_CPPFLAGS forces automake
# to output a definition for newlib_basedir.
-INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/xstormy16/Makefile.in b/newlib/libc/machine/xstormy16/Makefile.in
index 494520e..960830c 100644
--- a/newlib/libc/machine/xstormy16/Makefile.in
+++ b/newlib/libc/machine/xstormy16/Makefile.in
@@ -214,10 +214,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# hack: putting $(newlib_basedir)/libm/common into INCLUDES forces automake
+# hack: putting $(newlib_basedir)/libm/common into AM_CPPFLAGS forces automake
# to output a definition for newlib_basedir.
-INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/machine/z8k/Makefile.am b/newlib/libc/machine/z8k/Makefile.am
index 6a4b121..6cddac4 100644
--- a/newlib/libc/machine/z8k/Makefile.am
+++ b/newlib/libc/machine/z8k/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/z8k/Makefile.in b/newlib/libc/machine/z8k/Makefile.in
index b44bd35..b8f1373 100644
--- a/newlib/libc/machine/z8k/Makefile.in
+++ b/newlib/libc/machine/z8k/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S memset.S memcpy.S memmove.S memcmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/misc/Makefile.am b/newlib/libc/misc/Makefile.am
index e76fb79..da4f90f 100644
--- a/newlib/libc/misc/Makefile.am
+++ b/newlib/libc/misc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = __dprintf.c unctrl.c ffs.c init.c fini.c
diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in
index 94dae0d..abee6b7 100644
--- a/newlib/libc/misc/Makefile.in
+++ b/newlib/libc/misc/Makefile.in
@@ -279,7 +279,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = __dprintf.c unctrl.c ffs.c init.c fini.c $(am__append_1)
libmisc_la_LDFLAGS = -Xcompiler -nostdlib
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libmisc.la
diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am
index 32356ec..5fb1fa2 100644
--- a/newlib/libc/posix/Makefile.am
+++ b/newlib/libc/posix/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
closedir.c collate.c collcmp.c creat.c dirfd.c \
diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in
index 8bbfe52..962b8c1 100644
--- a/newlib/libc/posix/Makefile.in
+++ b/newlib/libc/posix/Makefile.in
@@ -309,7 +309,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
closedir.c collate.c collcmp.c creat.c dirfd.c \
fnmatch.c glob.c _isatty.c isatty.c \
diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am
index 1a2014c..a8544c8 100644
--- a/newlib/libc/reent/Makefile.am
+++ b/newlib/libc/reent/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
if HAVE_STDIO64_DIR
STDIO64_SOURCES = \
diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in
index 39adf03..9c1d312 100644
--- a/newlib/libc/reent/Makefile.in
+++ b/newlib/libc/reent/Makefile.in
@@ -305,7 +305,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
@HAVE_STDIO64_DIR_TRUE@STDIO64_SOURCES = \
@HAVE_STDIO64_DIR_TRUE@ fstat64r.c \
@HAVE_STDIO64_DIR_TRUE@ lseek64r.c \
diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am
index 99a04f6..5c5e0dc 100644
--- a/newlib/libc/search/Makefile.am
+++ b/newlib/libc/search/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
bsearch.c \
diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in
index 20883d0..6374bc4 100644
--- a/newlib/libc/search/Makefile.in
+++ b/newlib/libc/search/Makefile.in
@@ -294,7 +294,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
bsearch.c \
db_local.h \
diff --git a/newlib/libc/signal/Makefile.am b/newlib/libc/signal/Makefile.am
index 714a067..4b5bc20 100644
--- a/newlib/libc/signal/Makefile.am
+++ b/newlib/libc/signal/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = psignal.c raise.c signal.c sig2str.c
diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in
index d098cee..c810305 100644
--- a/newlib/libc/signal/Makefile.in
+++ b/newlib/libc/signal/Makefile.in
@@ -271,7 +271,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = psignal.c raise.c signal.c sig2str.c
libsignal_la_LDFLAGS = -Xcompiler -nostdlib
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libsignal.la
diff --git a/newlib/libc/ssp/Makefile.am b/newlib/libc/ssp/Makefile.am
index b820e77..937741c 100644
--- a/newlib/libc/ssp/Makefile.am
+++ b/newlib/libc/ssp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
chk_fail.c \
diff --git a/newlib/libc/ssp/Makefile.in b/newlib/libc/ssp/Makefile.in
index 401f737..59f2947 100644
--- a/newlib/libc/ssp/Makefile.in
+++ b/newlib/libc/ssp/Makefile.in
@@ -294,7 +294,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
chk_fail.c \
stack_protector.c
diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index 4702c8e..cbcd56c 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
if NEWLIB_NANO_FORMATTED_IO
GENERAL_INT_FORMATTED_IO_SOURCES =
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 6d18a44..a3f8628 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -461,7 +461,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
@NEWLIB_NANO_FORMATTED_IO_FALSE@GENERAL_INT_FORMATTED_IO_SOURCES = \
@NEWLIB_NANO_FORMATTED_IO_FALSE@ fiprintf.c \
@NEWLIB_NANO_FORMATTED_IO_FALSE@ fiscanf.c \
diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile.am
index 34d9abb..874993d 100644
--- a/newlib/libc/stdio64/Makefile.am
+++ b/newlib/libc/stdio64/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
# need a dummy object so objectlist.awk.in will build every time
GENERAL_SOURCES = dummy.c local64.h
diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile.in
index 280452c..b7dc373 100644
--- a/newlib/libc/stdio64/Makefile.in
+++ b/newlib/libc/stdio64/Makefile.in
@@ -285,7 +285,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
# need a dummy object so objectlist.awk.in will build every time
GENERAL_SOURCES = dummy.c local64.h
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index a91bdc7..9ecffea 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
__adjust.c \
diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
index 0fed51d..ece5035 100644
--- a/newlib/libc/stdlib/Makefile.in
+++ b/newlib/libc/stdlib/Makefile.in
@@ -388,7 +388,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = __adjust.c __atexit.c __call_atexit.c __exp10.c \
__ten_mu.c _Exit.c abort.c abs.c aligned_alloc.c assert.c \
atexit.c atof.c atoff.c atoi.c atol.c calloc.c div.c dtoa.c \
diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index 78d7c49..7eb9fcd 100644
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
bcopy.c \
diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index f6e8722..4bf8bec 100644
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -372,7 +372,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
bcopy.c \
bzero.c \
diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
index e380655..8ed4755 100644
--- a/newlib/libc/sys/a29khif/Makefile.am
+++ b/newlib/libc/sys/a29khif/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/a29khif/Makefile.in b/newlib/libc/sys/a29khif/Makefile.in
index 3022544..6b40cf6 100644
--- a/newlib/libc/sys/a29khif/Makefile.in
+++ b/newlib/libc/sys/a29khif/Makefile.in
@@ -230,8 +230,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = \
_alloc.S \
diff --git a/newlib/libc/sys/amdgcn/Makefile.am b/newlib/libc/sys/amdgcn/Makefile.am
index 8095cea..aca2510 100644
--- a/newlib/libc/sys/amdgcn/Makefile.am
+++ b/newlib/libc/sys/amdgcn/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES) $(CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS) $(CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/amdgcn/Makefile.in b/newlib/libc/sys/amdgcn/Makefile.in
index dcd2f7d..23796f2 100644
--- a/newlib/libc/sys/amdgcn/Makefile.in
+++ b/newlib/libc/sys/amdgcn/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES) $(CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS) $(CFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = close.c fstat.c isatty.c lseek.c read.c write.c \
fcntl.c getpid.c kill.c open.c raise.c stat.c unlink.c
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index f5524b6..c5d4c64 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(newlib_basedir)/libc/machine/arm
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(newlib_basedir)/libc/machine/arm
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile.in
index fde42db..78577d0 100644
--- a/newlib/libc/sys/arm/Makefile.in
+++ b/newlib/libc/sys/arm/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(newlib_basedir)/libc/machine/arm
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(newlib_basedir)/libc/machine/arm
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
@MAY_SUPPLY_SYSCALLS_FALSE@extra_objs =
@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = $(lpfx)libcfunc.o $(lpfx)trap.o $(lpfx)syscalls.o
diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
index 07a147c..efb5a00 100644
--- a/newlib/libc/sys/d10v/Makefile.am
+++ b/newlib/libc/sys/d10v/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/d10v/Makefile.in b/newlib/libc/sys/d10v/Makefile.in
index 8ff9a82..0e8e2c5 100644
--- a/newlib/libc/sys/d10v/Makefile.in
+++ b/newlib/libc/sys/d10v/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = syscalls.c trap.S creat.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/decstation/Makefile.am b/newlib/libc/sys/decstation/Makefile.am
index 9fd0ab9..e5e963d 100644
--- a/newlib/libc/sys/decstation/Makefile.am
+++ b/newlib/libc/sys/decstation/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/decstation/Makefile.in b/newlib/libc/sys/decstation/Makefile.in
index 88e0f51..732e8cc 100644
--- a/newlib/libc/sys/decstation/Makefile.in
+++ b/newlib/libc/sys/decstation/Makefile.in
@@ -206,8 +206,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
COPYOFILES = \
read.o \
diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am
index 25ca852..f54422d 100644
--- a/newlib/libc/sys/epiphany/Makefile.am
+++ b/newlib/libc/sys/epiphany/Makefile.am
@@ -26,9 +26,9 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/epiphany/Makefile.in b/newlib/libc/sys/epiphany/Makefile.in
index 6b351f3..b9660f0 100644
--- a/newlib/libc/sys/epiphany/Makefile.in
+++ b/newlib/libc/sys/epiphany/Makefile.in
@@ -235,8 +235,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
# crt0.o comes from libgloss
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index 4bb7e0b..03a681d 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/h8300hms/Makefile.in b/newlib/libc/sys/h8300hms/Makefile.in
index a4e0fcc..433be26 100644
--- a/newlib/libc/sys/h8300hms/Makefile.in
+++ b/newlib/libc/sys/h8300hms/Makefile.in
@@ -219,8 +219,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c \
close.S fstat.S lseek.S open.S read.S stat.S write.S
diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
index 8f66335..f9161da 100644
--- a/newlib/libc/sys/h8500hms/Makefile.am
+++ b/newlib/libc/sys/h8500hms/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/h8500hms/Makefile.in b/newlib/libc/sys/h8500hms/Makefile.in
index d3633ba..244a6f7 100644
--- a/newlib/libc/sys/h8500hms/Makefile.in
+++ b/newlib/libc/sys/h8500hms/Makefile.in
@@ -209,8 +209,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = syscalls.c misc.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index ab5c8df..c6b03eb 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
+AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
if ELIX_LEVEL_1
argp_dir=
diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index 5922bad..ee1d35e 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -372,7 +372,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
+AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
@ELIX_LEVEL_1_FALSE@argp_dir = argp
@ELIX_LEVEL_1_TRUE@argp_dir =
@ELIX_LEVEL_1_FALSE@ARGP_LIB = argp/libargp.la
diff --git a/newlib/libc/sys/linux/argp/Makefile.am b/newlib/libc/sys/linux/argp/Makefile.am
index 18aa370..9cdd5fe 100644
--- a/newlib/libc/sys/linux/argp/Makefile.am
+++ b/newlib/libc/sys/linux/argp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
argp-ba.c argp-eexst.c argp-fmtstream.c argp-fs-xinl.c \
diff --git a/newlib/libc/sys/linux/argp/Makefile.in b/newlib/libc/sys/linux/argp/Makefile.in
index e7564c6..2648116 100644
--- a/newlib/libc/sys/linux/argp/Makefile.in
+++ b/newlib/libc/sys/linux/argp/Makefile.in
@@ -261,7 +261,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
argp-ba.c argp-eexst.c argp-fmtstream.c argp-fs-xinl.c \
argp-help.c argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c
diff --git a/newlib/libc/sys/linux/cmath/Makefile.am b/newlib/libc/sys/linux/cmath/Makefile.am
index 5bab8b2..3db9469 100644
--- a/newlib/libc/sys/linux/cmath/Makefile.am
+++ b/newlib/libc/sys/linux/cmath/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
s_cacos.c s_casinf.c s_catanh.c s_ccosh.c s_clog.c s_cpowf.c s_csinh.c s_ctan.c \
diff --git a/newlib/libc/sys/linux/cmath/Makefile.in b/newlib/libc/sys/linux/cmath/Makefile.in
index 4422f7a..3aff010 100644
--- a/newlib/libc/sys/linux/cmath/Makefile.in
+++ b/newlib/libc/sys/linux/cmath/Makefile.in
@@ -279,7 +279,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
s_cacos.c s_casinf.c s_catanh.c s_ccosh.c s_clog.c s_cpowf.c s_csinh.c s_ctan.c \
s_cacosf.c s_casinh.c s_catanhf.c s_ccoshf.c s_clog10.c s_csinhf.c s_ctanf.c \
diff --git a/newlib/libc/sys/linux/dl/Makefile.am b/newlib/libc/sys/linux/dl/Makefile.am
index 92d801a..bfa72fb 100644
--- a/newlib/libc/sys/linux/dl/Makefile.am
+++ b/newlib/libc/sys/linux/dl/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
LIB_SOURCES = \
dl-addr.c dl-deps.c dl-init.c dl-load.c dl-misc.c dl-profile.c dl-runtime.c dl-version.c \
diff --git a/newlib/libc/sys/linux/dl/Makefile.in b/newlib/libc/sys/linux/dl/Makefile.in
index b70140e..20f8e15 100644
--- a/newlib/libc/sys/linux/dl/Makefile.in
+++ b/newlib/libc/sys/linux/dl/Makefile.in
@@ -269,7 +269,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
LIB_SOURCES = \
dl-addr.c dl-deps.c dl-init.c dl-load.c dl-misc.c dl-profile.c dl-runtime.c dl-version.c \
dl-close.c dl-error.c dl-iteratephdr.c dl-lookup.c dl-object.c dl-profstub.c dl-support.c \
diff --git a/newlib/libc/sys/linux/iconv/Makefile.am b/newlib/libc/sys/linux/iconv/Makefile.am
index 3f9ec62..c42afa8 100644
--- a/newlib/libc/sys/linux/iconv/Makefile.am
+++ b/newlib/libc/sys/linux/iconv/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
iconv.h gconv.h \
diff --git a/newlib/libc/sys/linux/iconv/Makefile.in b/newlib/libc/sys/linux/iconv/Makefile.in
index b37d96d..726ebb6 100644
--- a/newlib/libc/sys/linux/iconv/Makefile.in
+++ b/newlib/libc/sys/linux/iconv/Makefile.in
@@ -267,7 +267,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
iconv.h gconv.h \
iconv_open.c iconv.c iconv_close.c \
diff --git a/newlib/libc/sys/linux/intl/Makefile.am b/newlib/libc/sys/linux/intl/Makefile.am
index 441b6b2..2070e48 100644
--- a/newlib/libc/sys/linux/intl/Makefile.am
+++ b/newlib/libc/sys/linux/intl/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
bindtextdom.c catgets.c dcgettext.c dgettext.c gettext.c \
diff --git a/newlib/libc/sys/linux/intl/Makefile.in b/newlib/libc/sys/linux/intl/Makefile.in
index 77b8cdd..5de9930 100644
--- a/newlib/libc/sys/linux/intl/Makefile.in
+++ b/newlib/libc/sys/linux/intl/Makefile.in
@@ -267,7 +267,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
bindtextdom.c catgets.c dcgettext.c dgettext.c gettext.c \
dcigettext.c dcngettext.c dngettext.c ngettext.c open_catalog.c \
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.am b/newlib/libc/sys/linux/linuxthreads/Makefile.am
index a628023..962c1c5 100644
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.am
+++ b/newlib/libc/sys/linux/linuxthreads/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
LIBTOOL_VERSION_INFO = 0:0:0
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.in b/newlib/libc/sys/linux/linuxthreads/Makefile.in
index 140b245..cd348d8 100644
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.in
+++ b/newlib/libc/sys/linux/linuxthreads/Makefile.in
@@ -404,7 +404,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
LIBTOOL_VERSION_INFO = 0:0:0
LIB_SOURCES = \
attr.c barrier.c condvar.c \
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
index 1f27f3c..5854aa5 100644
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
+++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = -I. -I$(srcdir) $(INCLUDES)
+AM_CCASFLAGS = -I. -I$(srcdir) $(AM_CPPFLAGS)
LIB_SOURCES = clone.S i386-sysdep.S pspinlock.c sysdep.S
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in
index 872c848..0dba30c 100644
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in
+++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in
@@ -269,8 +269,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = -I. -I$(srcdir) $(INCLUDES)
+AM_CPPFLAGS = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = -I. -I$(srcdir) $(AM_CPPFLAGS)
LIB_SOURCES = clone.S i386-sysdep.S pspinlock.c sysdep.S
liblinuxthreadsi386_la_LDFLAGS = -Xcompiler -nostdlib
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblinuxthreadsi386.la
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.am b/newlib/libc/sys/linux/machine/i386/Makefile.am
index 938efac..8abade1 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.am
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.am
@@ -1,13 +1,13 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = get_clockfreq.c getpagesize.c hp-timing.c setjmp.S sigaction.c dl-procinfo.c
liblinuxi386_la_LDFLAGS = -Xcompiler -nostdlib
AM_CFLAGS = -I$(srcdir)/../..
-AM_CCASFLAGS = -I$(srcdir)/../.. $(INCLUDES)
+AM_CCASFLAGS = -I$(srcdir)/../.. $(AM_CPPFLAGS)
if USE_LIBTOOL
noinst_LTLIBRARIES = liblinuxi386.la
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.in b/newlib/libc/sys/linux/machine/i386/Makefile.in
index 5ceb6f7..6873b8f 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.in
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.in
@@ -270,11 +270,11 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = get_clockfreq.c getpagesize.c hp-timing.c setjmp.S sigaction.c dl-procinfo.c
liblinuxi386_la_LDFLAGS = -Xcompiler -nostdlib
AM_CFLAGS = -I$(srcdir)/../..
-AM_CCASFLAGS = -I$(srcdir)/../.. $(INCLUDES)
+AM_CCASFLAGS = -I$(srcdir)/../.. $(AM_CPPFLAGS)
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblinuxi386.la
@USE_LIBTOOL_TRUE@liblinuxi386_la_SOURCES = $(LIB_SOURCES)
@USE_LIBTOOL_FALSE@noinst_DATA =
diff --git a/newlib/libc/sys/linux/net/Makefile.am b/newlib/libc/sys/linux/net/Makefile.am
index da8ee0a..cbd613a 100644
--- a/newlib/libc/sys/linux/net/Makefile.am
+++ b/newlib/libc/sys/linux/net/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = addr2ascii.c ascii2addr.c alias-lookup.c \
base64.c check_pf.c digits_dots.c \
diff --git a/newlib/libc/sys/linux/net/Makefile.in b/newlib/libc/sys/linux/net/Makefile.in
index 2d6d1ea..4014cbc 100644
--- a/newlib/libc/sys/linux/net/Makefile.in
+++ b/newlib/libc/sys/linux/net/Makefile.in
@@ -364,7 +364,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = addr2ascii.c ascii2addr.c alias-lookup.c \
base64.c check_pf.c digits_dots.c \
ether_aton.c ether_aton_r.c ether_hton.c \
diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
index 3fcc0d1..dd1bc13 100644
--- a/newlib/libc/sys/m88kbug/Makefile.am
+++ b/newlib/libc/sys/m88kbug/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/m88kbug/Makefile.in b/newlib/libc/sys/m88kbug/Makefile.in
index 17c57ac..2f9c9ed 100644
--- a/newlib/libc/sys/m88kbug/Makefile.in
+++ b/newlib/libc/sys/m88kbug/Makefile.in
@@ -209,8 +209,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = syscalls.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index e93d202..1f16e91 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/mmixware/Makefile.in b/newlib/libc/sys/mmixware/Makefile.in
index dd94e0f..7991455 100644
--- a/newlib/libc/sys/mmixware/Makefile.in
+++ b/newlib/libc/sys/mmixware/Makefile.in
@@ -227,8 +227,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
execv.c execve.c fork.c fstat.c getpid.c isatty.c \
diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
index 44e54e5..8e70bde 100644
--- a/newlib/libc/sys/netware/Makefile.am
+++ b/newlib/libc/sys/netware/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/netware/Makefile.in b/newlib/libc/sys/netware/Makefile.in
index 2d7b0e2..eebf703 100644
--- a/newlib/libc/sys/netware/Makefile.in
+++ b/newlib/libc/sys/netware/Makefile.in
@@ -206,8 +206,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = \
getpid.c \
diff --git a/newlib/libc/sys/or1k/Makefile.am b/newlib/libc/sys/or1k/Makefile.am
index 7259a55..c326a36 100644
--- a/newlib/libc/sys/or1k/Makefile.am
+++ b/newlib/libc/sys/or1k/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/or1k/Makefile.in b/newlib/libc/sys/or1k/Makefile.in
index e77b456..4f0bf7b 100644
--- a/newlib/libc/sys/or1k/Makefile.in
+++ b/newlib/libc/sys/or1k/Makefile.in
@@ -214,8 +214,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = getreent.S mlock.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index 583add0..b1f3fcb 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
+AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
SUBDIRS = machine
diff --git a/newlib/libc/sys/phoenix/Makefile.in b/newlib/libc/sys/phoenix/Makefile.in
index fa25229..3a4d04b 100644
--- a/newlib/libc/sys/phoenix/Makefile.in
+++ b/newlib/libc/sys/phoenix/Makefile.in
@@ -259,7 +259,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
+AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
SUBDIRS = machine
SUBLIBS = \
$(PHOENIX_MACH_LIB)
diff --git a/newlib/libc/sys/phoenix/machine/arm/Makefile.am b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
index e47e6d0..58f8678 100644
--- a/newlib/libc/sys/phoenix/machine/arm/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
@@ -1,11 +1,11 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = syscall.S
AM_CFLAGS = -I$(srcdir)/../..
-AM_CCASFLAGS = -I$(srcdir)/../.. $(INCLUDES)
+AM_CCASFLAGS = -I$(srcdir)/../.. $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
diff --git a/newlib/libc/sys/phoenix/machine/arm/Makefile.in b/newlib/libc/sys/phoenix/machine/arm/Makefile.in
index 6ac7b9c..8a6d41e 100644
--- a/newlib/libc/sys/phoenix/machine/arm/Makefile.in
+++ b/newlib/libc/sys/phoenix/machine/arm/Makefile.in
@@ -217,10 +217,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = syscall.S
AM_CFLAGS = -I$(srcdir)/../..
-AM_CCASFLAGS = -I$(srcdir)/../.. $(INCLUDES)
+AM_CCASFLAGS = -I$(srcdir)/../.. $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
index 49b64bb..748bd8c 100644
--- a/newlib/libc/sys/rdos/Makefile.am
+++ b/newlib/libc/sys/rdos/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/rdos/Makefile.in b/newlib/libc/sys/rdos/Makefile.in
index 7b606ec..cff64e9 100644
--- a/newlib/libc/sys/rdos/Makefile.in
+++ b/newlib/libc/sys/rdos/Makefile.in
@@ -225,8 +225,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c \
diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
index 0bb3130..2077dbd 100644
--- a/newlib/libc/sys/rtems/Makefile.am
+++ b/newlib/libc/sys/rtems/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/rtems/Makefile.in b/newlib/libc/sys/rtems/Makefile.in
index 46a2e3a..d63d772 100644
--- a/newlib/libc/sys/rtems/Makefile.in
+++ b/newlib/libc/sys/rtems/Makefile.in
@@ -210,8 +210,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = dummysys.c cpusetalloc.c cpusetfree.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 32a526e..184b621 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES) $(CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS) $(CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sh/Makefile.in b/newlib/libc/sys/sh/Makefile.in
index e2218c7..107aece 100644
--- a/newlib/libc/sys/sh/Makefile.in
+++ b/newlib/libc/sys/sh/Makefile.in
@@ -216,8 +216,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES) $(CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS) $(CFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/sparc64/Makefile.am b/newlib/libc/sys/sparc64/Makefile.am
index 2d8d56a..3fda3e7 100644
--- a/newlib/libc/sys/sparc64/Makefile.am
+++ b/newlib/libc/sys/sparc64/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sparc64/Makefile.in b/newlib/libc/sys/sparc64/Makefile.in
index 4223ca9..0afff7c 100644
--- a/newlib/libc/sys/sparc64/Makefile.in
+++ b/newlib/libc/sys/sparc64/Makefile.in
@@ -234,8 +234,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
# _r.o is for the reentrant syscall stubs.
diff --git a/newlib/libc/sys/sun4/Makefile.am b/newlib/libc/sys/sun4/Makefile.am
index 47a17cc..bf4a8c9 100644
--- a/newlib/libc/sys/sun4/Makefile.am
+++ b/newlib/libc/sys/sun4/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sun4/Makefile.in b/newlib/libc/sys/sun4/Makefile.in
index 1f728d6..c93fddd 100644
--- a/newlib/libc/sys/sun4/Makefile.in
+++ b/newlib/libc/sys/sun4/Makefile.in
@@ -209,8 +209,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
COPYOFILES = \
Ovfork.o \
diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
index f75b9a3..e5d0e91 100644
--- a/newlib/libc/sys/sysmec/Makefile.am
+++ b/newlib/libc/sys/sysmec/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sysmec/Makefile.in b/newlib/libc/sys/sysmec/Makefile.in
index 9e1abca..99d7188 100644
--- a/newlib/libc/sys/sysmec/Makefile.in
+++ b/newlib/libc/sys/sysmec/Makefile.in
@@ -226,8 +226,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
execv.c execve.c fork.c fstat.c getpid.c isatty.c \
diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
index 9347941..50d4fd0 100644
--- a/newlib/libc/sys/sysnec810/Makefile.am
+++ b/newlib/libc/sys/sysnec810/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sysnec810/Makefile.in b/newlib/libc/sys/sysnec810/Makefile.in
index 4289beb..5c71c68 100644
--- a/newlib/libc/sys/sysnec810/Makefile.in
+++ b/newlib/libc/sys/sysnec810/Makefile.in
@@ -215,8 +215,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = io.S write.c sbrk.c misc.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
index 05c9095..db6860a 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.am
+++ b/newlib/libc/sys/sysnecv850/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sysnecv850/Makefile.in b/newlib/libc/sys/sysnecv850/Makefile.in
index 4e19339..67b42c0 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.in
+++ b/newlib/libc/sys/sysnecv850/Makefile.in
@@ -229,8 +229,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
@MAY_SUPPLY_SYSCALLS_FALSE@extra_objs =
@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = $(lpfx)_exit.o $(lpfx)access.o $(lpfx)chmod.o \
diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
index 439ed78..d1c04d5 100644
--- a/newlib/libc/sys/sysvi386/Makefile.am
+++ b/newlib/libc/sys/sysvi386/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sysvi386/Makefile.in b/newlib/libc/sys/sysvi386/Makefile.in
index 6647c18..ccbb4a0 100644
--- a/newlib/libc/sys/sysvi386/Makefile.in
+++ b/newlib/libc/sys/sysvi386/Makefile.in
@@ -244,8 +244,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = \
ioctl.S isatty.c read.S lseek.S close.S sbrk.c fstat.S cerror.S \
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
index 6c847b0..c23e5d0 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.am
+++ b/newlib/libc/sys/sysvnecv70/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.in b/newlib/libc/sys/sysvnecv70/Makefile.in
index 622a96e..3f8625c 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.in
+++ b/newlib/libc/sys/sysvnecv70/Makefile.in
@@ -220,8 +220,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ioctl.S isatty.S read.S lseek.S close.S sbrk.S fstat.S \
cerror.S exit.S write.S sysv60.S fpx.c fps.S open.S
diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
index e192d59..98c4ead 100644
--- a/newlib/libc/sys/tic80/Makefile.am
+++ b/newlib/libc/sys/tic80/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/tic80/Makefile.in b/newlib/libc/sys/tic80/Makefile.in
index 086af01..161e306 100644
--- a/newlib/libc/sys/tic80/Makefile.in
+++ b/newlib/libc/sys/tic80/Makefile.in
@@ -210,8 +210,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES =
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/tirtos/Makefile.am b/newlib/libc/sys/tirtos/Makefile.am
index 6349bc8..033fee6 100644
--- a/newlib/libc/sys/tirtos/Makefile.am
+++ b/newlib/libc/sys/tirtos/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/tirtos/Makefile.in b/newlib/libc/sys/tirtos/Makefile.in
index 6b9bfda..48f38cc 100644
--- a/newlib/libc/sys/tirtos/Makefile.in
+++ b/newlib/libc/sys/tirtos/Makefile.in
@@ -209,8 +209,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = lock.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
index 4237c53..a8b57e7 100644
--- a/newlib/libc/sys/w65/Makefile.am
+++ b/newlib/libc/sys/w65/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/w65/Makefile.in b/newlib/libc/sys/w65/Makefile.in
index 5d15cbe..a5b581f 100644
--- a/newlib/libc/sys/w65/Makefile.in
+++ b/newlib/libc/sys/w65/Makefile.in
@@ -209,8 +209,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = syscalls.c trap.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
index f677222..8ef2b49 100644
--- a/newlib/libc/sys/z8ksim/Makefile.am
+++ b/newlib/libc/sys/z8ksim/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/sys/z8ksim/Makefile.in b/newlib/libc/sys/z8ksim/Makefile.in
index b1b8358..6975865 100644
--- a/newlib/libc/sys/z8ksim/Makefile.in
+++ b/newlib/libc/sys/z8ksim/Makefile.in
@@ -209,8 +209,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = glue.c
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
diff --git a/newlib/libc/syscalls/Makefile.am b/newlib/libc/syscalls/Makefile.am
index 67e0b0d..5895be4 100644
--- a/newlib/libc/syscalls/Makefile.am
+++ b/newlib/libc/syscalls/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
sysclose.c \
diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in
index 25204ff..3f258a9 100644
--- a/newlib/libc/syscalls/Makefile.in
+++ b/newlib/libc/syscalls/Makefile.in
@@ -288,7 +288,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
sysclose.c \
sysfcntl.c \
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am
index fa6de13..8871d1a 100644
--- a/newlib/libc/time/Makefile.am
+++ b/newlib/libc/time/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
asctime.c \
diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in
index b24fd07..62130b9 100644
--- a/newlib/libc/time/Makefile.in
+++ b/newlib/libc/time/Makefile.in
@@ -284,7 +284,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
asctime.c \
asctime_r.c \
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index fe81ac8..a2d830f 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
getcwd.c \
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index 61276fb..bc4d203 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -290,7 +290,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
getcwd.c \
pread.c \
diff --git a/newlib/libc/xdr/Makefile.am b/newlib/libc/xdr/Makefile.am
index 3251266..ad9968c 100644
--- a/newlib/libc/xdr/Makefile.am
+++ b/newlib/libc/xdr/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
xdr_private.c \
diff --git a/newlib/libc/xdr/Makefile.in b/newlib/libc/xdr/Makefile.in
index 244a83f..1c3a734 100644
--- a/newlib/libc/xdr/Makefile.in
+++ b/newlib/libc/xdr/Makefile.in
@@ -283,7 +283,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
xdr_private.c \
xdr.c \
diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index 0f4189b..ef55e90 100644
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \
s_cbrt.c s_exp10.c s_expm1.c s_ilogb.c \
diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in
index 6f3cc97..fd61213 100644
--- a/newlib/libm/common/Makefile.in
+++ b/newlib/libm/common/Makefile.in
@@ -369,7 +369,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \
s_cbrt.c s_exp10.c s_expm1.c s_ilogb.c \
s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c \
diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am
index 3868c76..73fa190 100644
--- a/newlib/libm/complex/Makefile.am
+++ b/newlib/libm/complex/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c \
catan.c catanh.c ccos.c ccosh.c cephes_subr.c \
diff --git a/newlib/libm/complex/Makefile.in b/newlib/libm/complex/Makefile.in
index 72fd2ad..2757061 100644
--- a/newlib/libm/complex/Makefile.in
+++ b/newlib/libm/complex/Makefile.in
@@ -302,7 +302,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c \
catan.c catanh.c ccos.c ccosh.c cephes_subr.c \
cexp.c cimag.c clog.c clog10.c conj.c \
diff --git a/newlib/libm/fenv/Makefile.am b/newlib/libm/fenv/Makefile.am
index 9d2954a..db59c80 100644
--- a/newlib/libm/fenv/Makefile.am
+++ b/newlib/libm/fenv/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
fegetround.c feholdexcept.c feraiseexcept.c fesetenv.c \
diff --git a/newlib/libm/fenv/Makefile.in b/newlib/libm/fenv/Makefile.in
index 1c69668..59008cd 100644
--- a/newlib/libm/fenv/Makefile.in
+++ b/newlib/libm/fenv/Makefile.in
@@ -263,7 +263,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
fegetround.c feholdexcept.c feraiseexcept.c fesetenv.c \
fesetexceptflag.c fesetround.c fetestexcept.c feupdateenv.c
diff --git a/newlib/libm/machine/aarch64/Makefile.am b/newlib/libm/machine/aarch64/Makefile.am
index 5f8770a..9bd9fc7 100644
--- a/newlib/libm/machine/aarch64/Makefile.am
+++ b/newlib/libm/machine/aarch64/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/aarch64/Makefile.in b/newlib/libm/machine/aarch64/Makefile.in
index 4531e80..1d29ae7 100644
--- a/newlib/libm/machine/aarch64/Makefile.in
+++ b/newlib/libm/machine/aarch64/Makefile.in
@@ -232,7 +232,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index 45e175e..b3b4e7c 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/arm/Makefile.in b/newlib/libm/machine/arm/Makefile.in
index bc8e009..1a18621 100644
--- a/newlib/libm/machine/arm/Makefile.in
+++ b/newlib/libm/machine/arm/Makefile.in
@@ -227,7 +227,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index 52f2880..a011f96 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
LIB_SOURCES = \
f_atan2.S f_atan2f.S f_exp.c f_expf.c \
diff --git a/newlib/libm/machine/i386/Makefile.in b/newlib/libm/machine/i386/Makefile.in
index 3bea804..dbd8e74 100644
--- a/newlib/libm/machine/i386/Makefile.in
+++ b/newlib/libm/machine/i386/Makefile.in
@@ -289,8 +289,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(AM_CPPFLAGS)
LIB_SOURCES = \
f_atan2.S f_atan2f.S f_exp.c f_expf.c \
f_frexp.S f_frexpf.S f_llrint.c f_llrintf.c f_llrintl.c \
diff --git a/newlib/libm/machine/mips/Makefile.am b/newlib/libm/machine/mips/Makefile.am
index 44e4aca..5db49db 100644
--- a/newlib/libm/machine/mips/Makefile.am
+++ b/newlib/libm/machine/mips/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/mips/Makefile.in b/newlib/libm/machine/mips/Makefile.in
index 19b1a94..16c4f7f 100644
--- a/newlib/libm/machine/mips/Makefile.in
+++ b/newlib/libm/machine/mips/Makefile.in
@@ -217,7 +217,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/nds32/Makefile.am b/newlib/libm/machine/nds32/Makefile.am
index 5fa129d..f140f05 100644
--- a/newlib/libm/machine/nds32/Makefile.am
+++ b/newlib/libm/machine/nds32/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
if HAS_NDS32_FPU_SP_FALSE
diff --git a/newlib/libm/machine/nds32/Makefile.in b/newlib/libm/machine/nds32/Makefile.in
index 418db2f..398b779 100644
--- a/newlib/libm/machine/nds32/Makefile.in
+++ b/newlib/libm/machine/nds32/Makefile.in
@@ -224,7 +224,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
@HAS_NDS32_FPU_SP_FALSE@GPR_SOURCES =
diff --git a/newlib/libm/machine/powerpc/Makefile.am b/newlib/libm/machine/powerpc/Makefile.am
index 3d8dd25..a2c4b08 100644
--- a/newlib/libm/machine/powerpc/Makefile.am
+++ b/newlib/libm/machine/powerpc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/powerpc/Makefile.in b/newlib/libm/machine/powerpc/Makefile.in
index d37204c..17c33f4 100644
--- a/newlib/libm/machine/powerpc/Makefile.in
+++ b/newlib/libm/machine/powerpc/Makefile.in
@@ -217,7 +217,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/pru/Makefile.am b/newlib/libm/machine/pru/Makefile.am
index 69facdf..1293995 100644
--- a/newlib/libm/machine/pru/Makefile.am
+++ b/newlib/libm/machine/pru/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/pru/Makefile.in b/newlib/libm/machine/pru/Makefile.in
index 3b6d7d0..c6ed666 100644
--- a/newlib/libm/machine/pru/Makefile.in
+++ b/newlib/libm/machine/pru/Makefile.in
@@ -216,7 +216,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/riscv/Makefile.am b/newlib/libm/machine/riscv/Makefile.am
index fd26d95..b4b4e2c 100644
--- a/newlib/libm/machine/riscv/Makefile.am
+++ b/newlib/libm/machine/riscv/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/riscv/Makefile.in b/newlib/libm/machine/riscv/Makefile.in
index 374d50e..c11e626 100644
--- a/newlib/libm/machine/riscv/Makefile.in
+++ b/newlib/libm/machine/riscv/Makefile.in
@@ -232,7 +232,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/sparc/Makefile.am b/newlib/libm/machine/sparc/Makefile.am
index 3415776..c3aa4e6 100644
--- a/newlib/libm/machine/sparc/Makefile.am
+++ b/newlib/libm/machine/sparc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/sparc/Makefile.in b/newlib/libm/machine/sparc/Makefile.in
index b6456f6..9805536 100644
--- a/newlib/libm/machine/sparc/Makefile.in
+++ b/newlib/libm/machine/sparc/Makefile.in
@@ -217,7 +217,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/spu/Makefile.am b/newlib/libm/machine/spu/Makefile.am
index 9e2c597..1bc35a0 100644
--- a/newlib/libm/machine/spu/Makefile.am
+++ b/newlib/libm/machine/spu/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/spu/Makefile.in b/newlib/libm/machine/spu/Makefile.in
index 5e352ac..c9a20cc 100644
--- a/newlib/libm/machine/spu/Makefile.in
+++ b/newlib/libm/machine/spu/Makefile.in
@@ -274,7 +274,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/x86_64/Makefile.am b/newlib/libm/machine/x86_64/Makefile.am
index 3c34ca7..b0171b6 100644
--- a/newlib/libm/machine/x86_64/Makefile.am
+++ b/newlib/libm/machine/x86_64/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/machine/x86_64/Makefile.in b/newlib/libm/machine/x86_64/Makefile.in
index d007503..5c60906 100644
--- a/newlib/libm/machine/x86_64/Makefile.in
+++ b/newlib/libm/machine/x86_64/Makefile.in
@@ -262,7 +262,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
+AM_CPPFLAGS = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index af31da0..5529c35 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = k_standard.c k_rem_pio2.c \
k_cos.c k_sin.c k_tan.c \
diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in
index d9f437a..6c55b72 100644
--- a/newlib/libm/math/Makefile.in
+++ b/newlib/libm/math/Makefile.in
@@ -348,7 +348,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = k_standard.c k_rem_pio2.c \
k_cos.c k_sin.c k_tan.c \
e_acos.c e_acosh.c e_asin.c e_atan2.c \
diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index 67139e8..39fb8b1 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = s_acos.c s_frexp.c s_mathcnst.c \
s_cos.c s_sinh.c \
diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in
index 6912299..0a98bc0 100644
--- a/newlib/libm/mathfp/Makefile.in
+++ b/newlib/libm/mathfp/Makefile.in
@@ -320,7 +320,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = s_acos.c s_frexp.c s_mathcnst.c \
s_cos.c s_sinh.c \
s_asin.c\