diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2012-10-03 12:26:37 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2012-10-03 12:26:37 +0400 |
| commit | c1ed4a55703fcdd4874b22e799117ecee76fc307 (patch) | |
| tree | 5e25f2878c26d5101e10b863b948e8ab49be4ee5 /libgc | |
| parent | 61a1c77f3774a574681563d44ede66d19276d150 (diff) | |
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.
Diffstat (limited to 'libgc')
| -rw-r--r-- | libgc/Makefile.am | 4 | ||||
| -rw-r--r-- | libgc/configure.in | 12 |
2 files changed, 8 insertions, 8 deletions
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 |