Permalink
Browse files

Use AM_CPPFLAGS instead of INCLUDES in Makefile.am files, as the late…

  • Loading branch information...
1 parent 61a1c77 commit c1ed4a55703fcdd4874b22e799117ecee76fc307 @vargaz vargaz committed Oct 3, 2012
View
2 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
View
2 ikvm-native/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = $(GMODULE_CFLAGS)
+AM_CPPFLAGS = $(GMODULE_CFLAGS)
lib_LTLIBRARIES = libikvm-native.la
View
4 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 $@
View
12 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
View
2 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)
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 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
View
2 mono/interpreter/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
$(LIBGC_CPPFLAGS) \
$(GLIB_CFLAGS)
View
2 mono/io-layer/Makefile.am
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libwapi.la
-INCLUDES = \
+AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(LIBGC_CPPFLAGS) \
-DMONO_BINDIR=\""$(bindir)"\" \
View
2 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.
View
2 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)
View
2 mono/monograph/Makefile.am
@@ -22,7 +22,7 @@ endif
bin_PROGRAMS = monograph
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GLIB_CFLAGS)
View
2 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)
View
2 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
View
2 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
View
2 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
View
2 po/Makefile.am
@@ -1 +1 @@
-SUBDIRS = mcs
+SUBDIRS = mcs
View
2 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
+ cp $(srcdir)/size/size.c $(srcdir)/size/Makefile $(srcdir)/size/README $(distdir)/size
View
2 support/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = \
libMonoPosixHelper.la \
$(SUPPORT)
-INCLUDES = \
+AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)
View
2 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

0 comments on commit c1ed4a5

Please sign in to comment.