diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-15 18:30:32 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-16 23:32:52 -0800 |
| commit | b8dd42dce868f9c16a59790ce51f0542b59cb79d (patch) | |
| tree | c4bbc26376eaaf02b808e45ff966b9c20c6f720f | |
| parent | 8d946d2606b3a349b2a54d602e027a09ae330e88 (diff) | |
Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS
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@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/FreeType/Makefile.am | 6 | ||||
| -rw-r--r-- | src/bitmap/Makefile.am | 2 | ||||
| -rw-r--r-- | src/builtins/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fontfile/Makefile.am | 2 | ||||
| -rw-r--r-- | src/stubs/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 |