telepathy-glib: Pass on all AM_CPPFLAGS and CPPFLAGS to g-ir-scanner

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue May 28 09:56:49 2013 +0100

Pass on all AM_CPPFLAGS and CPPFLAGS to g-ir-scanner

Failure to do so causes a false-positive in Debian's build log checks,
which check that "hardening" flags are passed to all compilations.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65293
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 telepathy-glib/introspection.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index b415073..ad23841 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -87,7 +87,9 @@ TelepathyGLib_0_12_gir_FILES = \
 TelepathyGLib_0_12_gir_NAMESPACE = TelepathyGLib
 TelepathyGLib_0_12_gir_VERSION = 0.12
 TelepathyGLib_0_12_gir_LIBS = libtelepathy-glib.la
-TelepathyGLib_0_12_gir_CFLAGS = -D_TP_COMPILATION
+# g-ir-scanner picks up CFLAGS from the environment, but not CPPFLAGS.
+# We don't want to give it our AM_CFLAGS, which include extra warnings.
+TelepathyGLib_0_12_gir_CFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS)
 TelepathyGLib_0_12_gir_EXPORT_PACKAGES = telepathy-glib
 
 TelepathyGLib_0_12_gir_SCANNERFLAGS = \