[totem] plugins: Attempt to silence some warnings unavoidably produced by Vala

[Philip Withnall <pwithnall src gnome org>]

commit f6b135427c4a1317b457590b741266c71ea71e5f
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Sep 30 13:10:02 2013 +0100

    plugins: Attempt to silence some warnings unavoidably produced by Vala
    
    This won’t work if the -Wno-* flags are later overridden by custom CFLAGS,
    but should work to silence spurious warnings about generated C code
    otherwise.

 src/plugins/Makefile.plugins         |    8 ++++++++
 src/plugins/rotation/Makefile.am     |    2 +-
 src/plugins/sample-vala/Makefile.am  |    2 +-
 src/plugins/zeitgeist-dp/Makefile.am |    1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/Makefile.plugins b/src/plugins/Makefile.plugins
index 96d9cf5..a9f8620 100644
--- a/src/plugins/Makefile.plugins
+++ b/src/plugins/Makefile.plugins
@@ -33,6 +33,14 @@ plugin_ldflags = \
 plugin_libadd = \
        $(top_builddir)/src/libtotem.la
 
+# Disable some C warnings for Vala plugins which just create noise because the
+# C code Vala generates is a little messy.
+vala_plugin_cflags = \
+       -Wno-unused-but-set-variable \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       $(NULL)
+
 # Checking rules for Python plugins
 # Execute pylint on all the requisite files individually, returning non-zero
 # iff any of the calls to pylint returned non-zero.
diff --git a/src/plugins/rotation/Makefile.am b/src/plugins/rotation/Makefile.am
index 0b00917..7da6d70 100644
--- a/src/plugins/rotation/Makefile.am
+++ b/src/plugins/rotation/Makefile.am
@@ -13,7 +13,7 @@ AM_VALAFLAGS = \
 
 librotation_la_SOURCES = totem-rotation-plugin.vala
 librotation_la_LDFLAGS = $(plugin_ldflags)
-librotation_la_CFLAGS = $(plugin_cflags) -include $(CONFIG_HEADER) -I $(top_srcdir)/src/backend
+librotation_la_CFLAGS = $(plugin_cflags) $(vala_plugin_cflags) -include $(CONFIG_HEADER) -I 
$(top_srcdir)/src/backend
 librotation_la_LIBADD = $(plugin_libadd)
 
 GITIGNOREFILES = \
diff --git a/src/plugins/sample-vala/Makefile.am b/src/plugins/sample-vala/Makefile.am
index f7ac1c2..dba7385 100644
--- a/src/plugins/sample-vala/Makefile.am
+++ b/src/plugins/sample-vala/Makefile.am
@@ -13,7 +13,7 @@ AM_VALAFLAGS = \
 
 libsample_vala_la_SOURCES = totem-sample-vala-plugin.vala
 libsample_vala_la_LDFLAGS = $(plugin_ldflags)
-libsample_vala_la_CFLAGS = $(plugin_cflags)
+libsample_vala_la_CFLAGS = $(plugin_cflags) $(vala_plugin_cflags)
 libsample_vala_la_LIBADD = $(plugin_libadd)
 
 GITIGNOREFILES = \
diff --git a/src/plugins/zeitgeist-dp/Makefile.am b/src/plugins/zeitgeist-dp/Makefile.am
index b369c5e..2b32379 100644
--- a/src/plugins/zeitgeist-dp/Makefile.am
+++ b/src/plugins/zeitgeist-dp/Makefile.am
@@ -20,6 +20,7 @@ libtotem_zeitgeist_dp_plugin_la_LIBADD = \
        $(LIBZEITGEIST_LIBS)
 libtotem_zeitgeist_dp_plugin_la_CFLAGS = \
        $(plugin_cflags) \
+       $(vala_plugin_cflags) \
        $(LIBZEITGEIST_CFLAGS) \
        -I $(top_srcdir)/src/backend