From 63e2719a8f1d61a4678207e9abcecd67087c31ac Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 7 Dec 2010 10:33:23 -0500 Subject: config: replace deprecated INCLUDES with AM_CPPFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes automake warning. Acked-by: Daniel Stone Reviewed-by: Kristian Høgsberg Signed-off-by: Gaetan Nadon --- src/Makefile.am | 2 +- src/makekeys/Makefile.am | 2 +- src/xkbcomp/Makefile.am | 2 +- test/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ed69b9d..7ae10de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = makekeys xkbcomp -INCLUDES = -I$(top_srcdir)/include -I$(builddir)/makekeys +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir)/makekeys AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) $(XMALLOC_ZERO_CFLAGS) lib_LTLIBRARIES = libxkbcommon.la diff --git a/src/makekeys/Makefile.am b/src/makekeys/Makefile.am index 781723c..44d5081 100644 --- a/src/makekeys/Makefile.am +++ b/src/makekeys/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) # need to use build-native compiler diff --git a/src/xkbcomp/Makefile.am b/src/xkbcomp/Makefile.am index 375318a..59a49a9 100644 --- a/src/xkbcomp/Makefile.am +++ b/src/xkbcomp/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) \ -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' diff --git a/test/Makefile.am b/test/Makefile.am index 0ca07f4..c4934be 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) TESTS_ENVIRONMENT = $(SHELL) -- cgit v1.2.3