[totem-pl-parser] build: Use AM_CPPFLAGS instead of INCLUDES



commit 9a163bfd6c5be1b2c5cd19f82e041c8416eb2942
Author: Philip Withnall <withnall endlessm com>
Date:   Mon Dec 19 08:21:34 2016 +0000

    build: Use AM_CPPFLAGS instead of INCLUDES
    
    INCLUDES is deprecated. This fixes an automake warning.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776259

 docs/reference/Makefile.am |    4 ++--
 plparse/tests/Makefile.am  |    4 +---
 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)          \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]