Skip to content

Commit c1ed4a5

Browse files
vargazvargaz
committed
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.
1 parent 61a1c77 commit c1ed4a5

File tree

29 files changed

+35
-35
lines changed

29 files changed

+35
-35
lines changed

‎eglib/src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2
5959
libeglib_static_la_SOURCES=$(libeglib_la_SOURCES)
6060
libeglib_static_la_CFLAGS = $(libeglib_la_CFLAGS)
6161

62-
INCLUDES = -I$(srcdir)
62+
AM_CPPFLAGS = -I$(srcdir)
6363

6464
if HOST_WIN32
6565
libeglib_la_LIBADD = -lm $(LIBICONV) -lpsapi

‎ikvm-native/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GMODULE_CFLAGS)
2+
AM_CPPFLAGS = $(GMODULE_CFLAGS)
33

44
lib_LTLIBRARIES = libikvm-native.la
55

‎libgc/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I m4
2222

2323
SUBDIRS = m4 include doc
2424

25-
INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
25+
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
2626

2727
#
2828
# libtool is not capable of creating shared/static versions of a convenience
@@ -115,7 +115,7 @@ endif
115115

116116
## We have our own definition of LTCOMPILE because we want to use our
117117
## CFLAGS, not those passed in from the top level make.
118-
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(INCLUDES) \
118+
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
119119
-I$(top_srcdir)/include $(AM_CPPFLAGS) $(CPPFLAGS) \
120120
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
121121
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@

‎libgc/configure.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ AC_ARG_ENABLE(cplusplus,
7575
[ --enable-cplusplus install C++ support],
7676
)
7777

78-
INCLUDES=-I${srcdir}/include
78+
AM_CPPFLAGS=-I${srcdir}/include
7979
THREADDLLIBS=
8080
## Libraries needed to support dynamic loading and/or threads.
8181
case "$THREADS" in
@@ -115,7 +115,7 @@ case "$THREADS" in
115115
*-*-freebsd*)
116116
AC_DEFINE(GC_FREEBSD_THREADS)
117117
if test "x$PTHREAD_CFLAGS" != "x"; then
118-
INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
118+
AM_CPPFLAGS="$AM_CPPFLAGS $PTHREAD_CFLAGS"
119119
fi
120120
if test "x$PTHREAD_LIBS" = "x"; then
121121
THREADDLLIBS=-pthread
@@ -163,7 +163,7 @@ case "$THREADS" in
163163
# May want to enable it in other cases, too.
164164
# Measurements havent yet been done.
165165
fi
166-
INCLUDES="$INCLUDES -pthread"
166+
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
167167
THREADDLLIBS="-lpthread -lrt"
168168
;;
169169
*)
@@ -191,7 +191,7 @@ case "$THREADS" in
191191
AC_DEFINE(GC_DGUX386_THREADS)
192192
AC_DEFINE(DGUX_THREADS)
193193
# Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
194-
INCLUDES="-pthread $INCLUDES"
194+
AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
195195
;;
196196
aix)
197197
THREADS=posix
@@ -256,7 +256,7 @@ addobjs=
256256
addlibs=
257257
addincludes=
258258
addtests=
259-
CXXINCLUDES=
259+
CXXAM_CPPFLAGS=
260260
case "$TARGET_ECOS" in
261261
no)
262262
;;
@@ -276,7 +276,7 @@ AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
276276

277277
AC_SUBST(CXX)
278278

279-
AC_SUBST(INCLUDES)
279+
AC_SUBST(AM_CPPFLAGS)
280280
AC_SUBST(CXXINCLUDES)
281281

282282
# Configuration of shared libraries

‎mono/arch/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DIST_SUBDIRS = x86 ppc sparc arm s390 s390x alpha hppa amd64 ia64 mips
22

3-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
3+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
44

55
if INTERP_SUPPORTED
66
SUBDIRS = $(arch_target)

‎mono/arch/alpha/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-alpha.la
55

‎mono/arch/amd64/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-amd64.la
55

‎mono/arch/arm/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-arm.la
55

‎mono/arch/hppa/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-hppa.la
55

‎mono/arch/mips/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-mips.la
55

‎mono/arch/ppc/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if INTERP_SUPPORTED
22

3-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
3+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
44

55
noinst_LTLIBRARIES = libmonoarch-ppc.la
66

‎mono/arch/s390/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-s390.la
55

‎mono/arch/s390x/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-s390x.la
55

‎mono/arch/sparc/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
2+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
33

44
noinst_LTLIBRARIES = libmonoarch-sparc.la
55

‎mono/arch/x86/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if INTERP_SUPPORTED
22

3-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
3+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
44

55
noinst_LTLIBRARIES = libmonoarch-x86.la
66

‎mono/dis/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
1+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
22

33
if HOST_WIN32
44
export HOST_CC

‎mono/interpreter/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = \
1+
AM_CPPFLAGS = \
22
-I$(top_srcdir) \
33
$(LIBGC_CPPFLAGS) \
44
$(GLIB_CFLAGS)

‎mono/io-layer/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
noinst_LTLIBRARIES = libwapi.la
33

4-
INCLUDES = \
4+
AM_CPPFLAGS = \
55
$(GLIB_CFLAGS) \
66
$(LIBGC_CPPFLAGS) \
77
-DMONO_BINDIR=\""$(bindir)"\" \

‎mono/metadata/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ else
6666
noinst_LTLIBRARIES = $(boehm_libraries) $(sgen_libraries) $(moonlight_libraries)
6767
endif
6868

69-
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
69+
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
7070

7171
#
7272
# Make sure any prefix changes are updated in the binaries too.

‎mono/mini/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ mono_SOURCES = \
150150

151151
mono_CFLAGS = $(AM_CFLAGS)
152152

153-
INCLUDES = $(LIBGC_CPPFLAGS)
153+
AM_CPPFLAGS = $(LIBGC_CPPFLAGS)
154154

155155
mono_sgen_SOURCES = $(mono_SOURCES)
156156
mono_sgen_CFLAGS = $(AM_CFLAGS)

‎mono/monograph/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif
2222

2323
bin_PROGRAMS = monograph
2424

25-
INCLUDES = \
25+
AM_CPPFLAGS = \
2626
-I$(top_srcdir) \
2727
$(GLIB_CFLAGS)
2828

‎mono/profiler/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ else
44
Z_LIBS=
55
endif
66

7-
INCLUDES = \
7+
AM_CPPFLAGS = \
88
-fexceptions -DMONO_USE_EXC_TABLES \
99
-I$(top_srcdir) \
1010
$(GLIB_CFLAGS)

‎mono/tests/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ test-oom: $(OOM_TESTS)
10351035

10361036
noinst_LTLIBRARIES = libtest.la
10371037

1038-
INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
1038+
AM_CPPFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
10391039

10401040
if HOST_WIN32
10411041
# gcc-3.4.4 emits incorrect code when making indirect calls to stdcall functions using a tail call

‎mono/utils/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
noinst_LTLIBRARIES = libmonoutils.la
22

3-
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS)
3+
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS)
44

55
if ENABLE_DTRACE
66

‎mono/wrapper/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lib_LTLIBRARIES = libmonowrapper.la
22

3-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
3+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
44

55
if HOST_WIN32
66
# glob.c doesnt build under windows

‎po/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SUBDIRS = mcs
1+
SUBDIRS = mcs

‎samples/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ dist-hook:
88
cp $(srcdir)/embed/test-metadata.c $(distdir)/embed
99
cp $(srcdir)/embed/test-invoke.c $(srcdir)/embed/invoke.cs $(distdir)/embed
1010
cp $(srcdir)/size/sample.cs $(srcdir)/size/objectinspector.cs $(distdir)/size
11-
cp $(srcdir)/size/size.c $(srcdir)/size/Makefile $(srcdir)/size/README $(distdir)/size
11+
cp $(srcdir)/size/size.c $(srcdir)/size/Makefile $(srcdir)/size/README $(distdir)/size

‎support/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = \
77
libMonoPosixHelper.la \
88
$(SUPPORT)
99

10-
INCLUDES = \
10+
AM_CPPFLAGS = \
1111
$(GLIB_CFLAGS) \
1212
-I$(top_srcdir)
1313

‎tools/sgen/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bin_PROGRAMS = sgen-grep-binprot
22

3-
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
3+
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
44

55
sgen_grep_binprot_SOURCES = \
66
sgen-grep-binprot.c

0 commit comments

Comments
 (0)