summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-18 23:08:24 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-18 23:08:24 -0800
commit7381c2f9013ef7784c78091fa671e652a62ca706 (patch)
tree3146d9f373f78f584e5325d73e019bc9737445e7
parent875d8f2504b62e4a536269e54f685eb8ff96df3a (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>
-rw-r--r--src/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 98e1614..647359b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,12 +16,10 @@ libxkbfile_la_SOURCES = \
xkmout.c \
xkmread.c
-INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/
-
-
-libxkbfile_la_LIBADD = @XKBFILE_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/
AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@
+libxkbfile_la_LIBADD = @XKBFILE_LIBS@
libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined
libxkbfileincludedir = $(includedir)/X11/extensions