Include ERROR_CFLAGS everywhere we compile C code

AM_CFLAGS was missing from a couple of foo_CFLAGS variables (it isn't
"inherited" automatically), so add that too.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=697354
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <philip@tecnocode.co.uk>

diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am
index 4d31659..5d4d8a5 100644 (file)
--- a/backends/eds/Makefile.am
+++ b/backends/eds/Makefile.am
@@ -43,6 +43,7 @@ eds_la_CPPFLAGS = \
 
 eds_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 8f00006..804cc47 100644 (file)
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -63,6 +63,7 @@ libfolks_eds_la_VALAFLAGS = \
 
 libfolks_eds_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am
index c3a372f..a139d55 100644 (file)
--- a/backends/key-file/Makefile.am
+++ b/backends/key-file/Makefile.am
@@ -34,6 +34,7 @@ key_file_la_CPPFLAGS = \
 
 key_file_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am
index 1e52276..1d2bd70 100644 (file)
--- a/backends/libsocialweb/Makefile.am
+++ b/backends/libsocialweb/Makefile.am
@@ -41,6 +41,7 @@ libsocialweb_la_CPPFLAGS = \
 
 libsocialweb_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index 0255895..891a3f1 100644 (file)
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -61,6 +61,8 @@ folks_backend_libsocialweb_deps = \
        $(NULL)
 
 libfolks_libsocialweb_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GIO_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/ofono/Makefile.am b/backends/ofono/Makefile.am
index 695afca..2ecc8cd 100644 (file)
--- a/backends/ofono/Makefile.am
+++ b/backends/ofono/Makefile.am
@@ -41,6 +41,7 @@ ofono_la_CPPFLAGS = \
 
 ofono_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index d96312c..cd05860 100644 (file)
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -44,6 +44,7 @@ telepathy_la_CPPFLAGS = \
 
 telepathy_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 535d501..351c22a 100644 (file)
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -32,6 +32,7 @@ tp_lowlevel_headers = tp-lowlevel.h
 
 libtp_lowlevel_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(C_ERROR_CFLAGS) \
        $(GIO_CFLAGS) \

diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am
index c0f2965..60fa274 100644 (file)
--- a/backends/tracker/Makefile.am
+++ b/backends/tracker/Makefile.am
@@ -42,6 +42,7 @@ tracker_la_CPPFLAGS = \
 
 tracker_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index bc8cc0f..a97de09 100644 (file)
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -55,6 +55,7 @@ libfolks_tracker_la_CPPFLAGS = \
 
 libfolks_tracker_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/folks/Makefile.am b/folks/Makefile.am
index 4d539ab..abd1bdf 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -40,6 +40,7 @@ endif
 
 libfolks_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am
index 6b5a194..4316b90 100644 (file)
--- a/tests/eds/Makefile.am
+++ b/tests/eds/Makefile.am
@@ -1,3 +1,7 @@
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index ab09944..e91d657 100644 (file)
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -1,3 +1,7 @@
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am
index 58c1e81..5f562c5 100644 (file)
--- a/tests/key-file/Makefile.am
+++ b/tests/key-file/Makefile.am
@@ -1,3 +1,7 @@
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 7054249..9ed4ab9 100644 (file)
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -45,6 +45,7 @@ libfolks_test_la_SOURCES = \
 
 libfolks_test_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am
index afa7757..1a9a609 100644 (file)
--- a/tests/lib/eds/Makefile.am
+++ b/tests/lib/eds/Makefile.am
@@ -28,6 +28,8 @@ libeds_test_la_SOURCES = \
        $(NULL)
 
 libeds_test_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \
        $(EBOOK_CFLAGS) \

diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am
index 5249215..b351eb2 100644 (file)
--- a/tests/lib/key-file/Makefile.am
+++ b/tests/lib/key-file/Makefile.am
@@ -22,6 +22,8 @@ libkf_test_la_SOURCES = \
 libkf_test_la_CFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/tests/lib \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \
        $(NULL)

diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index a338eb3..8dcf8cd 100644 (file)
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -25,6 +25,8 @@ libsocialweb_test_la_SOURCES = \
        $(NULL)
 
 libsocialweb_test_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/lib/telepathy/Makefile.am b/tests/lib/telepathy/Makefile.am
index 9fc4ae5..8f2e0fc 100644 (file)
--- a/tests/lib/telepathy/Makefile.am
+++ b/tests/lib/telepathy/Makefile.am
@@ -29,6 +29,8 @@ libtpf_test_la_SOURCES = \
        $(NULL)
 
 libtpf_test_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/tests/lib \
        -I$(top_srcdir)/tests/lib/key-file \

diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index 7cb0cb6..4c3761f 100644 (file)
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -40,6 +40,8 @@ libtp_test_contactlist_la_SOURCES = \
        $(NULL)
 
 libtp_test_contactlist_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(C_ERROR_CFLAGS) \
        $(TP_GLIB_CFLAGS) \
        $(DBUS_GLIB_CFLAGS) \

diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index 0870ad0..2b09076 100644 (file)
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -25,6 +25,8 @@ libtracker_test_la_SOURCES = \
        $(NULL)
 
 libtracker_test_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \
        $(TRACKER_SPARQL_CFLAGS) \

diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am
index 57e8d8c..214bef8 100644 (file)
--- a/tests/libsocialweb/Makefile.am
+++ b/tests/libsocialweb/Makefile.am
@@ -1,3 +1,7 @@
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GIO_CFLAGS) \

diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index 8ad285b..a2378e2 100644 (file)
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -1,3 +1,7 @@
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
index a69a79c..a0443e3 100644 (file)
--- a/tests/tracker/Makefile.am
+++ b/tests/tracker/Makefile.am
@@ -1,3 +1,7 @@
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 86a2562..1eeb9ca 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,6 +31,7 @@ folks_import_CPPFLAGS = \
        $(NULL)
 folks_import_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \

diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am
index 03b0b38..5d9c932 100644 (file)
--- a/tools/inspect/Makefile.am
+++ b/tools/inspect/Makefile.am
@@ -44,6 +44,7 @@ folks_inspect_CPPFLAGS = \
        $(NULL)
 folks_inspect_CFLAGS = \
        $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GEE_CFLAGS) \