[PATCH:libXfont] Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS

[Peter Hutterer]

On Tue, Jan 15, 2013 at 06:34:42PM -0800, Alan Coopersmith wrote:
> Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
> 
>   - Support for the long-deprecated INCLUDES variable will be removed
>     altogether in Automake 1.14.  The AM_CPPFLAGS variable should be
>     used instead.
> 
> This variable was deprecated in Automake releases prior to 1.10, which is
> the current minimum level required to build X.
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter


> ---
>  src/FreeType/Makefile.am |    6 +++---
>  src/bitmap/Makefile.am   |    2 +-
>  src/builtins/Makefile.am |    2 +-
>  src/fc/Makefile.am       |    2 +-
>  src/fontfile/Makefile.am |    2 +-
>  src/stubs/Makefile.am    |    2 +-
>  src/util/Makefile.am     |    2 +-
>  7 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am
> index fa45da1..ab60ffa 100644
> --- a/src/FreeType/Makefile.am
> +++ b/src/FreeType/Makefile.am
> @@ -1,10 +1,10 @@
> -INCLUDES =                                \
> +AM_CPPFLAGS = 			\
>  	-I${top_srcdir}/include
>  
> -noinst_LTLIBRARIES = libft.la
> -
>  AM_CFLAGS = $(FREETYPE_CFLAGS) $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
>  
> +noinst_LTLIBRARIES = libft.la
> +
>  libft_la_SOURCES = 		\
>  	ft.h			\
>  	ftfuncs.h		\
> diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am
> index b5b9674..99682d9 100644
> --- a/src/bitmap/Makefile.am
> +++ b/src/bitmap/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES =			\
> +AM_CPPFLAGS =			\
>  	-I${top_srcdir}/include
>  
>  AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
> diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am
> index b203fda..6b96410 100644
> --- a/src/builtins/Makefile.am
> +++ b/src/builtins/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES =			\
> +AM_CPPFLAGS =			\
>  	-I${top_srcdir}/include \
>  	-I${top_srcdir}/src/bitmap
>  
> diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am
> index 3bfd231..c180cae 100644
> --- a/src/fc/Makefile.am
> +++ b/src/fc/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES =                      \
> +AM_CPPFLAGS = 			\
>  	-I${top_srcdir}/include
>  
>  AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
> diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
> index aa64ca5..ab54cfd 100644
> --- a/src/fontfile/Makefile.am
> +++ b/src/fontfile/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = -I${top_srcdir}/include
> +AM_CPPFLAGS = -I${top_srcdir}/include
>  
>  AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
>  
> diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am
> index 86dd8fc..23e3bd1 100644
> --- a/src/stubs/Makefile.am
> +++ b/src/stubs/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES =			\
> +AM_CPPFLAGS =			\
>  	-I${top_srcdir}/include
>  
>  AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
> diff --git a/src/util/Makefile.am b/src/util/Makefile.am
> index 055fc9d..32a8f37 100644
> --- a/src/util/Makefile.am
> +++ b/src/util/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES =			\
> +AM_CPPFLAGS =			\
>  	-I${top_srcdir}/include \
>  	-I$(top_srcdir)/src/stubs
>  
> -- 
> 1.7.9.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>