From c1ed4a55703fcdd4874b22e799117ecee76fc307 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Wed, 3 Oct 2012 10:26:37 +0200 Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES in Makefile.am files, as the later is no longer supported, see http://lists.gnu.org/archive/html/automake/2012-08/msg00087.html. --- eglib/src/Makefile.am | 2 +- ikvm-native/Makefile.am | 2 +- libgc/Makefile.am | 4 ++-- libgc/configure.in | 12 ++++++------ mono/arch/Makefile.am | 2 +- mono/arch/alpha/Makefile.am | 2 +- mono/arch/amd64/Makefile.am | 2 +- mono/arch/arm/Makefile.am | 2 +- mono/arch/hppa/Makefile.am | 2 +- mono/arch/mips/Makefile.am | 2 +- mono/arch/ppc/Makefile.am | 2 +- mono/arch/s390/Makefile.am | 2 +- mono/arch/s390x/Makefile.am | 2 +- mono/arch/sparc/Makefile.am | 2 +- mono/arch/x86/Makefile.am | 2 +- mono/dis/Makefile.am | 2 +- mono/interpreter/Makefile.am | 2 +- mono/io-layer/Makefile.am | 2 +- mono/metadata/Makefile.am | 2 +- mono/mini/Makefile.am | 2 +- mono/monograph/Makefile.am | 2 +- mono/profiler/Makefile.am | 2 +- mono/tests/Makefile.am | 2 +- mono/utils/Makefile.am | 2 +- mono/wrapper/Makefile.am | 2 +- po/Makefile.am | 2 +- samples/Makefile.am | 2 +- support/Makefile.am | 2 +- tools/sgen/Makefile.am | 2 +- 29 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am index 94bee684e04..0d0e90354ee 100644 --- 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 c670516a589..a916688137c 100644 --- 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 e8a0fd5cb3d..49dbe4be81c 100644 --- 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 97d548f03a4..18d1179f168 100644 --- 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 09604162948..28a91475f51 100644 --- 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 8e0accf9665..86cbcb6bfe1 100644 --- 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 54499b5caf2..3c728263190 100644 --- 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 180be53d3d8..86784c0f879 100644 --- 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 7e671cd4344..1d608adaf1e 100644 --- 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 c272d04bac3..1063365b99b 100644 --- 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 b013d210fa4..a4e2d5d2e7c 100644 --- 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 1c62a88c3bf..d8ebb6f8df2 100644 --- 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 e7466d948c9..ce7f4709744 100644 --- 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 e0f7689ee31..a8889040a3c 100644 --- 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 ab4c142aa9f..977823705ad 100644 --- 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 1fa0c43e8b0..477af4641a7 100644 --- 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 9ba0cbc2511..4cea04452be 100644 --- 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 81b252a5681..29cec27d5f1 100644 --- 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 14973f01f0a..963b63fea2b 100644 --- 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 c52869cc6da..068907b2cc6 100644 --- 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 d6989d9041b..d40e38b8470 100644 --- 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 93a323c55b6..33dda5c3798 100644 --- 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 84a0ad96875..e0138fa6130 100644 --- 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 6fdb608ecbb..5e078dccfaa 100644 --- 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 c427472f4fa..49bba1764fc 100644 --- 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 9534da72eda..36af85d530b 100644 --- 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 5118541ffcc..9a6260e084a 100644 --- 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 76d4381136d..1de8fc77cb7 100644 --- 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 cad05cb6efb..582cbae3189 100644 --- 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 -- 2.25.1