[totem] Clean up CXXFLAGS in browser-plugin/Makefile.am

[Philip Withnall <pwithnall src gnome org>]

commit 42ade5333c9587519cc0993595dcf27308d7e413
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 14:38:12 2010 +0100

    Clean up CXXFLAGS in browser-plugin/Makefile.am

 browser-plugin/Makefile.am |   39 +++++++++++----------------------------
 1 files changed, 11 insertions(+), 28 deletions(-)
---
diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index 21b1fb0..08db1f3 100644
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -17,6 +17,13 @@ AM_CPPFLAGS = \
 	-DLIBEXECDIR="\"$(libexecdir)\""		\
 	$(DISABLE_DEPRECATED)
 
+plugin_cxxflags = \
+	$(BROWSER_PLUGIN_CFLAGS)	\
+	$(DBUS_CFLAGS)			\
+	$(WARN_CXXFLAGS)		\
+	$(PLUGIN_EXTRA_WARN_CXXFLAGS)	\
+	$(AM_CXXFLAGS)
+
 plugin_libadd = \
 	libtotembrowserplugin_helper.la	\
 	$(DBUS_LIBS)			\
@@ -152,13 +159,7 @@ libtotem_gmp_plugin_la_CPPFLAGS = \
 	-DTOTEM_PL_PARSER_MINI				\
 	$(AM_CPPFLAGS)
 
-libtotem_gmp_plugin_la_CXXFLAGS = \
-	$(BROWSER_PLUGIN_CFLAGS)	\
-	$(DBUS_CFLAGS)			\
-	$(WARN_CXXFLAGS)		\
-	$(PLUGIN_EXTRA_WARN_CXXFLAGS)	\
-	$(AM_CXXFLAGS)
-
+libtotem_gmp_plugin_la_CXXFLAGS = $(plugin_cxxflags)
 libtotem_gmp_plugin_la_LIBADD = $(plugin_libadd)
 libtotem_gmp_plugin_la_LDFLAGS = $(plugin_ldflags)
 endif
@@ -192,13 +193,7 @@ libtotem_narrowspace_plugin_la_CPPFLAGS = \
 	-DTOTEM_PL_PARSER_MINI				\
 	$(AM_CPPFLAGS)
 
-libtotem_narrowspace_plugin_la_CXXFLAGS = \
-	$(BROWSER_PLUGIN_CFLAGS)	\
-	$(DBUS_CFLAGS)			\
-	$(WARN_CXXFLAGS)		\
-	$(PLUGIN_EXTRA_WARN_CXXFLAGS)	\
-	$(AM_CXXFLAGS)
-
+libtotem_narrowspace_plugin_la_CXXFLAGS = $(plugin_cxxflags)
 libtotem_narrowspace_plugin_la_LIBADD = $(plugin_libadd)
 libtotem_narrowspace_plugin_la_LDFLAGS = $(plugin_ldflags)
 endif
@@ -232,13 +227,7 @@ libtotem_mully_plugin_la_CPPFLAGS = \
 	-DTOTEM_PL_PARSER_MINI				\
 	$(AM_CPPFLAGS)
 
-libtotem_mully_plugin_la_CXXFLAGS = \
-	$(BROWSER_PLUGIN_CFLAGS)	\
-	$(DBUS_CFLAGS)			\
-	$(WARN_CXXFLAGS)		\
-	$(PLUGIN_EXTRA_WARN_CXXFLAGS)	\
-	$(AM_CXXFLAGS)
-
+libtotem_mully_plugin_la_CXXFLAGS = $(plugin_cxxflags)
 libtotem_mully_plugin_la_LIBADD = $(plugin_libadd)
 libtotem_mully_plugin_la_LDFLAGS = $(plugin_ldflags)
 endif
@@ -282,13 +271,7 @@ libtotem_cone_plugin_la_CPPFLAGS = \
 	-DTOTEM_PL_PARSER_MINI				\
 	$(AM_CPPFLAGS)
 
-libtotem_cone_plugin_la_CXXFLAGS = \
-	$(BROWSER_PLUGIN_CFLAGS)	\
-	$(DBUS_CFLAGS)			\
-	$(WARN_CXXFLAGS)		\
-	$(PLUGIN_EXTRA_WARN_CXXFLAGS)	\
-	$(AM_CXXFLAGS)
-
+libtotem_cone_plugin_la_CXXFLAGS = $(plugin_cxxflags)
 libtotem_cone_plugin_la_LIBADD = $(plugin_libadd)
 libtotem_cone_plugin_la_LDFLAGS = $(plugin_ldflags)
 endif