summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <withnall@endlessm.com>2016-12-19 08:21:34 +0000
committerPhilip Withnall <withnall@endlessm.com>2016-12-19 11:05:21 +0000
commit9a163bfd6c5be1b2c5cd19f82e041c8416eb2942 (patch)
treed2ab80e0973f06883a7d17aff93a2f8b41e9007d
parent0d0fd19226bd8a519946e0a2857482bdd30c900e (diff)
downloadtotem-pl-parser-9a163bfd6c5be1b2c5cd19f82e041c8416eb2942.tar.gz
build: Use AM_CPPFLAGS instead of INCLUDES
INCLUDES is deprecated. This fixes an automake warning. https://bugzilla.gnome.org/show_bug.cgi?id=776259
-rw-r--r--docs/reference/Makefile.am4
-rw-r--r--plparse/tests/Makefile.am4
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 2e3c632..6eee1fa 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -85,9 +85,9 @@ expand_content_files=
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
# Only needed if you are using gtkdoc-scangobj to dynamically query widget
# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(TOTEM_PLPARSER_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(TOTEM_PLPARSER_CFLAGS)
GTKDOC_LIBS=$(top_builddir)/plparse/libtotem-plparser.la $(TOTEM_PLPARSER_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/plparse/tests/Makefile.am b/plparse/tests/Makefile.am
index b15818b..ef0a886 100644
--- a/plparse/tests/Makefile.am
+++ b/plparse/tests/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/plparse \
-DTEST_SRCDIR=\""$(srcdir)/"\"
@@ -18,7 +18,6 @@ parser_CPPFLAGS = \
-I$(top_builddir)/plparse \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
$(DISABLE_DEPRECATED) \
- $(INCLUDES) \
$(AM_CPPFLAGS)
parser_CFLAGS = \
$(TOTEM_PLPARSER_CFLAGS)\
@@ -38,7 +37,6 @@ disc_LDADD = \
$(TOTEM_PLPARSER_LIBS)
disc_CPPFLAGS = \
$(common_defines) \
- $(INCLUDES) \
$(AM_CPPFLAGS)
disc_CFLAGS = \
$(WARN_CFLAGS) \