From fa5c747f4ca64c819ff7b0c35e81861fa41666c2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 28 May 2013 09:56:49 +0100 Subject: 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 --- telepathy-glib/introspection.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am index b4150734b..ad23841f8 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 = \ -- cgit v1.2.1