diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-28 09:56:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-06 15:49:57 +0100 |
| commit | fa5c747f4ca64c819ff7b0c35e81861fa41666c2 (patch) | |
| tree | 058509493aebb6891e54a7418d7b1ad10f65abcd | |
| parent | 79beda6266d5730d2c88cd31edd52d729f2cd27d (diff) | |
| download | telepathy-glib-fa5c747f4ca64c819ff7b0c35e81861fa41666c2.tar.gz | |
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@collabora.co.uk>
| -rw-r--r-- | 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 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 = \ |