diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2010-12-07 10:33:23 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2010-12-08 15:24:21 -0500 |
commit | 63e2719a8f1d61a4678207e9abcecd67087c31ac (patch) | |
tree | 8230b72496762a77089600888394dda885bc6b8c | |
parent | ceba14dc3eebb288862f1e6c8a7863895af859cb (diff) |
config: replace deprecated INCLUDES with AM_CPPFLAGS
Fixes automake warning.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/makekeys/Makefile.am | 2 | ||||
-rw-r--r-- | src/xkbcomp/Makefile.am | 2 | ||||
-rw-r--r-- | 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) |