From 26bc232f0d170f642c4ebaecc859746af0577837 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 12 Jul 2013 10:11:04 -0400 Subject: don't use INCLUDES automake seems to prefer AM_CPPFLAGS these days (and warns about use of INCLUDES as being an "old name"). --- bin/Makefile.am | 2 +- docs/Makefile.am | 2 +- editor/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 7fc29bd..fddeac7 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.gtester -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client bin_PROGRAMS = dconf diff --git a/docs/Makefile.am b/docs/Makefile.am index 582f198..542a38d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -12,7 +12,7 @@ CFILE_GLOB = $(top_srcdir)/client/*.c $(top_srcdir)/common/*.c MKDB_OPTIONS = --output-format=xml -INCLUDES = $(gio_CFLAGS) +AM_CPPFLAGS = $(gio_CFLAGS) GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client content_files = \ diff --git a/editor/Makefile.am b/editor/Makefile.am index 46ff003..eca1efa 100644 --- a/editor/Makefile.am +++ b/editor/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.gtester -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client bin_PROGRAMS = dconf-editor -- cgit v1.2.1