telepathy-farstream: Replace INCLUDES with equivalent AM_CPPFLAGS

Olivier Crête tester at kemper.freedesktop.org
Wed Sep 25 17:37:28 PDT 2013


Module: telepathy-farstream
Branch: master
Commit: edf5cf40797eca0e6661fe3b08912a84a39204c3
URL:    http://cgit.freedesktop.org/telepathy/telepathy-farstream/commit/?id=edf5cf40797eca0e6661fe3b08912a84a39204c3

Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Wed Sep 25 20:23:20 2013 -0400

Replace INCLUDES with equivalent AM_CPPFLAGS

---

 doc/lib/Makefile.am             |    2 +-
 telepathy-farstream/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/lib/Makefile.am b/doc/lib/Makefile.am
index 23dbc77..a2936f1 100644
--- a/doc/lib/Makefile.am
+++ b/doc/lib/Makefile.am
@@ -66,7 +66,7 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES= \
+AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(X11_CFLAGS) \
diff --git a/telepathy-farstream/Makefile.am b/telepathy-farstream/Makefile.am
index 50e03e3..45a6280 100644
--- a/telepathy-farstream/Makefile.am
+++ b/telepathy-farstream/Makefile.am
@@ -37,7 +37,7 @@ lib_LTLIBRARIES = libtelepathy-farstream.la
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = telepathy-farstream.pc
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
@@ -75,7 +75,7 @@ TelepathyFarstream_0_6_gir_INCLUDES = \
 	Gst-1.0 \
 	Farstream-0.2 \
 	TelepathyGLib-0.12
-TelepathyFarstream_0_6_gir_CFLAGS = $(INCLUDES)
+TelepathyFarstream_0_6_gir_CFLAGS = $(AM_CPPFLAGS)
 TelepathyFarstream_0_6_gir_LIBS = libtelepathy-farstream.la
 TelepathyFarstream_0_6_gir_FILES = $(introspection_sources)
 TelepathyFarstream_0_6_gir_SCANNERFLAGS = --identifier-prefix=tf_ --identifier-prefix=Tf



More information about the telepathy-commits mailing list