From 541806dc0937ae71c7ec9505f3335dfe7c7ffd73 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 28 May 2013 09:56:49 +0100 Subject: [PATCH] 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. --- 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 4789942..cd892d5 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 = \ -- 1.7.10.4