Use AM_CPPFLAGS instead of INCLUDES in Makefile.am files, as the later is no longer...

diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am
index 94bee684e0470a9c4ec5ea2b52da462e19a53e6e..0d0e90354ee8adb5c48053a37c012ab0d0991393 100644 (file)
--- a/eglib/src/Makefile.am
+++ b/eglib/src/Makefile.am
@@ -59,7 +59,7 @@ libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2
 libeglib_static_la_SOURCES=$(libeglib_la_SOURCES)
 libeglib_static_la_CFLAGS = $(libeglib_la_CFLAGS)
 
-INCLUDES = -I$(srcdir)
+AM_CPPFLAGS = -I$(srcdir)
 
 if HOST_WIN32
 libeglib_la_LIBADD = -lm $(LIBICONV) -lpsapi

diff --git a/ikvm-native/Makefile.am b/ikvm-native/Makefile.am
index c670516a5897f41f2286b6f46a930227a6623483..a916688137c5acd05967a4e7c7b02e2b785d46eb 100644 (file)
--- a/ikvm-native/Makefile.am
+++ b/ikvm-native/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GMODULE_CFLAGS)
+AM_CPPFLAGS = $(GMODULE_CFLAGS)
 
 lib_LTLIBRARIES = libikvm-native.la
 

diff --git a/libgc/Makefile.am b/libgc/Makefile.am
index e8a0fd5cb3d5099df040608dfa1095b7f93b3b84..49dbe4be81c6dcd2d3466b8ab07bf43b3b8417c6 100644 (file)
--- a/libgc/Makefile.am
+++ b/libgc/Makefile.am
@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = m4 include doc
 
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
 
 #
 # libtool is not capable of creating shared/static versions of a convenience
@@ -115,7 +115,7 @@ endif
 
 ## We have our own definition of LTCOMPILE because we want to use our
 ## CFLAGS, not those passed in from the top level make.
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
        -I$(top_srcdir)/include $(AM_CPPFLAGS) $(CPPFLAGS) \
        $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) 
 LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@

diff --git a/libgc/configure.in b/libgc/configure.in
index 97d548f03a4bb16bde439ff8f694d42106084c49..18d1179f16895cb7c6e6c17872434dc2ad4eeb89 100644 (file)
--- a/libgc/configure.in
+++ b/libgc/configure.in
@@ -75,7 +75,7 @@ AC_ARG_ENABLE(cplusplus,
 [  --enable-cplusplus          install C++ support],
 )
 
-INCLUDES=-I${srcdir}/include
+AM_CPPFLAGS=-I${srcdir}/include
 THREADDLLIBS=
 ## Libraries needed to support dynamic loading and/or threads.
 case "$THREADS" in
@@ -115,7 +115,7 @@ case "$THREADS" in
       *-*-freebsd*)
        AC_DEFINE(GC_FREEBSD_THREADS)
        if test "x$PTHREAD_CFLAGS" != "x"; then
-               INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
+               AM_CPPFLAGS="$AM_CPPFLAGS $PTHREAD_CFLAGS"
        fi
        if test "x$PTHREAD_LIBS" = "x"; then
                THREADDLLIBS=-pthread
@@ -163,7 +163,7 @@ case "$THREADS" in
          # May want to enable it in other cases, too.
          # Measurements havent yet been done.
        fi
-       INCLUDES="$INCLUDES -pthread"
+       AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
        THREADDLLIBS="-lpthread -lrt"
        ;;
       *)
@@ -191,7 +191,7 @@ case "$THREADS" in
     AC_DEFINE(GC_DGUX386_THREADS)
     AC_DEFINE(DGUX_THREADS)
     # Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
-    INCLUDES="-pthread $INCLUDES"
+    AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
     ;;
  aix)
     THREADS=posix
@@ -256,7 +256,7 @@ addobjs=
 addlibs=
 addincludes=
 addtests=
-CXXINCLUDES=
+CXXAM_CPPFLAGS=
 case "$TARGET_ECOS" in
    no)
       ;;
@@ -276,7 +276,7 @@ AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
 
 AC_SUBST(CXX)
 
-AC_SUBST(INCLUDES)
+AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(CXXINCLUDES)
 
 # Configuration of shared libraries

diff --git a/mono/arch/Makefile.am b/mono/arch/Makefile.am
index 09604162948bf881d6ab2fbcb6a6150bb98cf118..28a91475f51786df82ddc148ab3fda047aadea39 100644 (file)
--- a/mono/arch/Makefile.am
+++ b/mono/arch/Makefile.am
@@ -1,6 +1,6 @@
 DIST_SUBDIRS = x86 ppc sparc arm s390 s390x alpha hppa amd64 ia64 mips
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 if INTERP_SUPPORTED
 SUBDIRS = $(arch_target)

diff --git a/mono/arch/alpha/Makefile.am b/mono/arch/alpha/Makefile.am
index 8e0accf96653101e0d23b80b7d9d23f8cc275a82..86cbcb6bfe1e50798ba868ff9721ea10afc6fc69 100644 (file)
--- a/mono/arch/alpha/Makefile.am
+++ b/mono/arch/alpha/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-alpha.la
 

diff --git a/mono/arch/amd64/Makefile.am b/mono/arch/amd64/Makefile.am
index 54499b5caf2e31be56ecfc90c77a62196fd45ea1..3c728263190b068d699783b5071bbe75e27f2481 100644 (file)
--- a/mono/arch/amd64/Makefile.am
+++ b/mono/arch/amd64/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-amd64.la
 

diff --git a/mono/arch/arm/Makefile.am b/mono/arch/arm/Makefile.am
index 180be53d3d8b68e22306939537984d50c965cba7..86784c0f8794b0d2b42a96bfc0c7526820573a80 100644 (file)
--- a/mono/arch/arm/Makefile.am
+++ b/mono/arch/arm/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-arm.la
 

diff --git a/mono/arch/hppa/Makefile.am b/mono/arch/hppa/Makefile.am
index 7e671cd4344b0419f9f8dfd3534187ba2da98041..1d608adaf1e32efc089a2535b0b401aa22e2c821 100644 (file)
--- a/mono/arch/hppa/Makefile.am
+++ b/mono/arch/hppa/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-hppa.la
 

diff --git a/mono/arch/mips/Makefile.am b/mono/arch/mips/Makefile.am
index c272d04bac328e7da766ad9adac684b5e2473532..1063365b99bdd075eddc46beb24e5aab6420190e 100644 (file)
--- a/mono/arch/mips/Makefile.am
+++ b/mono/arch/mips/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-mips.la
 

diff --git a/mono/arch/ppc/Makefile.am b/mono/arch/ppc/Makefile.am
index b013d210fa45a071992a446d24a7252b56d5b073..a4e2d5d2e7ca8d6e23bb7d7bb34a0a0d0f928d0e 100644 (file)
--- a/mono/arch/ppc/Makefile.am
+++ b/mono/arch/ppc/Makefile.am
@@ -1,6 +1,6 @@
 if INTERP_SUPPORTED
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-ppc.la
 

diff --git a/mono/arch/s390/Makefile.am b/mono/arch/s390/Makefile.am
index 1c62a88c3bf6df4e27178ecad52299c6da5a1f11..d8ebb6f8df29fea1abd54b51a0e06279f29ddc3e 100644 (file)
--- a/mono/arch/s390/Makefile.am
+++ b/mono/arch/s390/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-s390.la
 

diff --git a/mono/arch/s390x/Makefile.am b/mono/arch/s390x/Makefile.am
index e7466d948c9f71e9525f34d900fc5c25a4c4611f..ce7f4709744c26896b0170ed19332fe1e3ad1ad7 100644 (file)
--- a/mono/arch/s390x/Makefile.am
+++ b/mono/arch/s390x/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-s390x.la
 

diff --git a/mono/arch/sparc/Makefile.am b/mono/arch/sparc/Makefile.am
index e0f7689ee31fd72d735b9b2cee20348c5ca520a9..a8889040a3c5f18e3dbbb8ea72b27dfed2d0728d 100644 (file)
--- a/mono/arch/sparc/Makefile.am
+++ b/mono/arch/sparc/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-sparc.la
 

diff --git a/mono/arch/x86/Makefile.am b/mono/arch/x86/Makefile.am
index ab4c142aa9fb9d046da1ac648458b34239fb6a28..977823705adf9bcf977f924524c39650bf94cf87 100644 (file)
--- a/mono/arch/x86/Makefile.am
+++ b/mono/arch/x86/Makefile.am
@@ -1,6 +1,6 @@
 if INTERP_SUPPORTED
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmonoarch-x86.la
 

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 1fa0c43e8b0f781fee5c53b0a86442a30a166357..477af4641a764914a1d86cef5c7ddbb54af2e174 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 if HOST_WIN32
 export HOST_CC

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index 9ba0cbc2511b5d9dba156a23020ef7f477514841..4cea04452be5d3ff2c4dbe80ed96306b2705895d 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        $(LIBGC_CPPFLAGS)               \
        $(GLIB_CFLAGS)

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 81b252a56819a14f8d4c19ffbdd4a652ec6df89f..29cec27d5f18f5fe6d74b5187cad09a7249809a0 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,7 +1,7 @@
 
 noinst_LTLIBRARIES = libwapi.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS)          \
        $(LIBGC_CPPFLAGS)       \
        -DMONO_BINDIR=\""$(bindir)"\"   \

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 14973f01f0a68c2ecde781d63d9c469a31fb7d40..963b63fea2b912840cb292f837ae40c8ac4128dc 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -66,7 +66,7 @@ else
 noinst_LTLIBRARIES = $(boehm_libraries) $(sgen_libraries) $(moonlight_libraries)
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index c52869cc6da69b4f78cdeb9dae42803bf7cd6d79..068907b2cc64e73e474a637d8b139d8c01103892 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -150,7 +150,7 @@ mono_SOURCES = \
 
 mono_CFLAGS = $(AM_CFLAGS)
 
-INCLUDES = $(LIBGC_CPPFLAGS)
+AM_CPPFLAGS = $(LIBGC_CPPFLAGS)
 
 mono_sgen_SOURCES = $(mono_SOURCES)
 mono_sgen_CFLAGS = $(AM_CFLAGS)

diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index d6989d9041bb9910c88b38257c858b3584ec8a2b..d40e38b8470c561a6a2238e56c7ff442bb171294 100644 (file)
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -22,7 +22,7 @@ endif
 
 bin_PROGRAMS = monograph
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        $(GLIB_CFLAGS)
 

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 93a323c55b6a0c9a747357c5d8e14b4b8244f4a9..33dda5c379832cae7cb170ff1b4d4ef8346329ba 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -4,7 +4,7 @@ else
 Z_LIBS=
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -fexceptions -DMONO_USE_EXC_TABLES      \
        -I$(top_srcdir)         \
        $(GLIB_CFLAGS)

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 84a0ad96875e115aeb33d381f7e75deb565158b1..e0138fa61301dca4659554026fe048059cacb4fd 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1035,7 +1035,7 @@ test-oom: $(OOM_TESTS)
 
 noinst_LTLIBRARIES = libtest.la
 
-INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
 
 if HOST_WIN32
 # gcc-3.4.4 emits incorrect code when making indirect calls to stdcall functions using a tail call

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 6fdb608ecbbb2a5d0ac6c18446dc3a627f8f0cf6..5e078dccfaad6cddcfbe7b0462d2b8e32f59afb3 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmonoutils.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS)
 
 if ENABLE_DTRACE
 

diff --git a/mono/wrapper/Makefile.am b/mono/wrapper/Makefile.am
index c427472f4fa3233525124461b35c70de2c9ebcfa..49bba1764fcb55d5b7ab3b3839aff117f0afb9fa 100644 (file)
--- a/mono/wrapper/Makefile.am
+++ b/mono/wrapper/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libmonowrapper.la
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 if HOST_WIN32
 # glob.c doesnt build under windows

diff --git a/po/Makefile.am b/po/Makefile.am
index 9534da72eda2af867deed9a488f89ee048aaf4cf..36af85d530b0ccaf547937e19c9fabb1e6098a09 100644 (file)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -1 +1 @@
-SUBDIRS = mcs
\ No newline at end of file
+SUBDIRS = mcs

diff --git a/samples/Makefile.am b/samples/Makefile.am
index 5118541ffccfe7c41864af9c00b4f6b9b12d7c40..9a6260e084ad3695bda3d9d5f17355828e3a27eb 100644 (file)
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -8,4 +8,4 @@ dist-hook:
        cp $(srcdir)/embed/test-metadata.c $(distdir)/embed
        cp $(srcdir)/embed/test-invoke.c $(srcdir)/embed/invoke.cs $(distdir)/embed
        cp $(srcdir)/size/sample.cs $(srcdir)/size/objectinspector.cs $(distdir)/size
-       cp $(srcdir)/size/size.c $(srcdir)/size/Makefile $(srcdir)/size/README $(distdir)/size
\ No newline at end of file
+       cp $(srcdir)/size/size.c $(srcdir)/size/Makefile $(srcdir)/size/README $(distdir)/size

diff --git a/support/Makefile.am b/support/Makefile.am
index 76d4381136d05c5a7bc3841af443e4bd0f35873b..1de8fc77cb7cc9d7c81e813785563d353d63f022 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES =                               \
        libMonoPosixHelper.la                   \
        $(SUPPORT)
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        $(GLIB_CFLAGS)                          \
        -I$(top_srcdir)
 

diff --git a/tools/sgen/Makefile.am b/tools/sgen/Makefile.am
index cad05cb6efb59884676448059303f2c95c54b16d..582cbae3189dbcf4356cbd2f9d737661801e4cdf 100644 (file)
--- a/tools/sgen/Makefile.am
+++ b/tools/sgen/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = sgen-grep-binprot
 
-INCLUDES =  $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS =  $(GLIB_CFLAGS) -I$(top_srcdir)
 
 sgen_grep_binprot_SOURCES = \
        sgen-grep-binprot.c