GNOME.org
 

[totem] Factor out common plugin makefile magic into a new Makefile.plugins

commit 8ba2f789411ef399afd884665f6bb201a7c399b8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 11:36:15 2010 +0100

    Factor out common plugin makefile magic into a new Makefile.plugins

 src/plugins/Makefile.am                       |    2 +
 src/plugins/Makefile.plugins                  |   24 ++++++++++++
 src/plugins/bemused/Makefile.am               |   25 +++----------
 src/plugins/brasero-disc-recorder/Makefile.am |   25 ++-----------
 src/plugins/chapters/Makefile.am              |   41 +++++++++------------
 src/plugins/coherence_upnp/Makefile.am        |   10 ++----
 src/plugins/dbus-service/Makefile.am          |   10 ++----
 src/plugins/galago/Makefile.am                |   26 ++-----------
 src/plugins/gromit/Makefile.am                |   27 ++------------
 src/plugins/iplayer/Makefile.am               |   11 ++----
 src/plugins/jamendo/Makefile.am               |   12 +++---
 src/plugins/lirc/Makefile.am                  |   29 +++------------
 src/plugins/media-player-keys/Makefile.am     |   38 ++++++-------------
 src/plugins/mythtv/Makefile.am                |   30 ++++------------
 src/plugins/ontop/Makefile.am                 |   26 ++------------
 src/plugins/opensubtitles/Makefile.am         |   12 +++---
 src/plugins/properties/Makefile.am            |   44 ++++++-----------------
 src/plugins/publish/Makefile.am               |   30 +++++----------
 src/plugins/pythonconsole/Makefile.am         |   12 +++----
 src/plugins/sample-python/Makefile.am         |   15 ++++----
 src/plugins/sample-vala/Makefile.am           |   49 ++++++-------------------
 src/plugins/screensaver/Makefile.am           |   26 +++-----------
 src/plugins/screenshot/Makefile.am            |   27 ++------------
 src/plugins/sidebar-test/Makefile.am          |   29 +++------------
 src/plugins/skipto/Makefile.am                |   30 +++------------
 src/plugins/thumbnail/Makefile.am             |   27 ++------------
 src/plugins/tracker/Makefile.am               |   23 ++----------
 src/plugins/youtube/Makefile.am               |   27 +++-----------
 28 files changed, 183 insertions(+), 504 deletions(-)
---
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 516d7a2..7dae027 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,4 +1,6 @@
 SUBDIRS = $(PLUGINS)
 DIST_SUBDIRS = $(ALL_PLUGINS)
 
+EXTRA_DIST = Makefile.plugins
+
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/Makefile.plugins b/src/plugins/Makefile.plugins
new file mode 100644
index 0000000..f8d98cf
--- /dev/null
+++ b/src/plugins/Makefile.plugins
@@ -0,0 +1,24 @@
+%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
+
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST = $(plugin_in_files)
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""Totem"\"	\
+	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir)/		\
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/src/plugins
+
+plugin_cflags = \
+	$(DEPENDENCY_CFLAGS)	\
+	$(PEAS_CFLAGS)		\
+	$(WARN_CFLAGS)
+
+plugin_ldflags = \
+	-export_dynamic \
+	-avoid-version \
+	-module
diff --git a/src/plugins/bemused/Makefile.am b/src/plugins/bemused/Makefile.am
index 29f9a3e..b9ae84d 100644
--- a/src/plugins/bemused/Makefile.am
+++ b/src/plugins/bemused/Makefile.am
@@ -1,33 +1,18 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/bemused
 plugin_LTLIBRARIES = libbemused.la
 
 plugin_in_files = bemused.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libbemused_la_SOURCES = totem-bemused.c
-libbemused_la_LDFLAGS = $(modules_flags)
+libbemused_la_LDFLAGS = $(plugin_ldflags)
 libbemused_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins	\
+	$(AM_CPPFLAGS)			\
 	-I$(top_srcdir)/src/backend
 libbemused_la_LIBADD = $(BEMUSED_LIBS)
-
-libbemused_la_CFLAGS =			\
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(WARN_CFLAGS)			\
+libbemused_la_CFLAGS = \
+	$(plugin_cflags)	\
 	$(BEMUSED_CFLAGS)
 
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/brasero-disc-recorder/Makefile.am b/src/plugins/brasero-disc-recorder/Makefile.am
index 01ebce0..70047d6 100644
--- a/src/plugins/brasero-disc-recorder/Makefile.am
+++ b/src/plugins/brasero-disc-recorder/Makefile.am
@@ -1,34 +1,15 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/brasero-disc-recorder
 plugin_LTLIBRARIES = libbrasero-disc-recorder.la
 
 plugin_in_files = brasero-disc-recorder.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libbrasero_disc_recorder_la_SOURCES = totem-disc-recorder.c
-libbrasero_disc_recorder_la_LDFLAGS = $(modules_flags)
+libbrasero_disc_recorder_la_LDFLAGS = $(plugin_ldflags)
 libbrasero_disc_recorder_la_LIBADD = $(DISC_RECORDER_LIBS)
-libbrasero_disc_recorder_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
 libbrasero_disc_recorder_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
+	$(plugin_cflags)		\
 	$(DISC_RECORDER_CFLAGS)
 
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/chapters/Makefile.am b/src/plugins/chapters/Makefile.am
index f56c091..27ac9f8 100644
--- a/src/plugins/chapters/Makefile.am
+++ b/src/plugins/chapters/Makefile.am
@@ -1,36 +1,29 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/chapters
 plugin_LTLIBRARIES = libchapters.la
 
 plugin_in_files = chapters.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = chapters-list.ui chapters-edit.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-libchapters_la_SOURCES = totem-chapters.c totem-cmml-parser.c totem-cmml-parser.h totem-chapters-utils.c totem-chapters-utils.h totem-edit-chapter.c totem-edit-chapter.h
-libchapters_la_LDFLAGS = $(modules_flags)
+EXTRA_DIST += $(ui_DATA)
+
+libchapters_la_SOURCES = \
+	totem-chapters.c	\
+	totem-cmml-parser.c	\
+	totem-cmml-parser.h	\
+	totem-chapters-utils.c	\
+	totem-chapters-utils.h	\
+	totem-edit-chapter.c	\
+	totem-edit-chapter.h
+libchapters_la_LDFLAGS = $(plugin_ldflags)
 libchapters_la_LIBADD = $(CHAPTERS_LIBS)
 libchapters_la_CPPFLAGS = \
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins
-
-libchapters_la_CFLAGS = 		\
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(CHAPTERS_CFLAGS)		\
-	$(WARN_CFLAGS)			\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+	$(AM_CPPFLAGS)			\
+	-I$(top_srcdir)/src/backend
+libchapters_la_CFLAGS = \
+	$(plugin_cflags)	\
+	$(CHAPTERS_CFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/coherence_upnp/Makefile.am b/src/plugins/coherence_upnp/Makefile.am
index f836085..841e4eb 100644
--- a/src/plugins/coherence_upnp/Makefile.am
+++ b/src/plugins/coherence_upnp/Makefile.am
@@ -1,14 +1,10 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/coherence_upnp
 plugin_PYTHON = coherence_upnp.py
 
 plugin_in_files = coherence_upnp.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-EXTRA_DIST = $(plugin_in_files) coherence_upnp.py
 
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST += coherence_upnp.py
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/dbus-service/Makefile.am b/src/plugins/dbus-service/Makefile.am
index 9358f89..5e336fc 100644
--- a/src/plugins/dbus-service/Makefile.am
+++ b/src/plugins/dbus-service/Makefile.am
@@ -1,14 +1,10 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/dbus
 plugin_PYTHON = dbus-service.py
 
 plugin_in_files = dbus-service.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-EXTRA_DIST = $(plugin_in_files) dbus-service.py
 
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST += dbus-service.py
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/galago/Makefile.am b/src/plugins/galago/Makefile.am
index d4a8217..ed11464 100644
--- a/src/plugins/galago/Makefile.am
+++ b/src/plugins/galago/Makefile.am
@@ -1,33 +1,15 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/galago
 plugin_LTLIBRARIES = libtgp.la
 
 plugin_in_files = galago.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libtgp_la_SOURCES = totem-galago.c
-libtgp_la_LDFLAGS = $(modules_flags)
+libtgp_la_LDFLAGS = $(plugin_ldflags)
 libtgp_la_LIBADD = $(LIBGALAGO_LIBS)
-libtgp_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
 libtgp_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(LIBGALAGO_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+	$(plugin_cflags)	\
+	$(LIBGALAGO_CFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/gromit/Makefile.am b/src/plugins/gromit/Makefile.am
index 42c21b1..8453d55 100644
--- a/src/plugins/gromit/Makefile.am
+++ b/src/plugins/gromit/Makefile.am
@@ -1,33 +1,12 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/gromit
 plugin_LTLIBRARIES = libgromit.la
 
 plugin_in_files = gromit.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libgromit_la_SOURCES = totem-gromit.c
-libgromit_la_LDFLAGS = $(modules_flags)
-libgromit_la_LIBADD = 
-libgromit_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-libgromit_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+libgromit_la_LDFLAGS = $(plugin_ldflags)
+libgromit_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/iplayer/Makefile.am b/src/plugins/iplayer/Makefile.am
index 34348b9..25c93ae 100644
--- a/src/plugins/iplayer/Makefile.am
+++ b/src/plugins/iplayer/Makefile.am
@@ -1,17 +1,14 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/iplayer
 plugin_PYTHON = iplayer.py iplayer2.py listparser.py
 
 plugin_in_files = iplayer.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = iplayer.ui
+EXTRA_DIST += $(ui_DATA)
 
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA) $(plugin_PYTHON)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST += $(plugin_PYTHON)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/jamendo/Makefile.am b/src/plugins/jamendo/Makefile.am
index d36aa5a..53bc9aa 100644
--- a/src/plugins/jamendo/Makefile.am
+++ b/src/plugins/jamendo/Makefile.am
@@ -1,13 +1,13 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/jamendo
 plugin_PYTHON = jamendo.py
 
 plugin_in_files = jamendo.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = jamendo.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(ui_DATA)
 
 gsettings_SCHEMAS = org.gnome.totem.plugins.jamendo.gschema.xml
 
@@ -17,10 +17,10 @@ gsettings_SCHEMAS = org.gnome.totem.plugins.jamendo.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = jamendo.convert
 
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA) jamendo.py org.gnome.totem.plugins.jamendo.gschema.xml.in.in jamendo.convert
+EXTRA_DIST += jamendo.py org.gnome.totem.plugins.jamendo.gschema.xml.in.in jamendo.convert
 
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+CLEANFILES += $(gsettings_SCHEMAS)
+DISTCLEANFILES += $(gsettings_SCHEMAS)
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/lirc/Makefile.am b/src/plugins/lirc/Makefile.am
index a61b336..41a1722 100644
--- a/src/plugins/lirc/Makefile.am
+++ b/src/plugins/lirc/Makefile.am
@@ -1,36 +1,17 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/lirc
 plugin_LTLIBRARIES = liblirc.la
 
 plugin_in_files = lirc.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 configdir = $(PLUGINDIR)/lirc
 config_DATA = totem_lirc_default
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(config_DATA)
 
 liblirc_la_SOURCES = totem-lirc.c
-liblirc_la_LDFLAGS = $(modules_flags)
-liblirc_la_LIBADD = $(LIRC_LIBS) 
-liblirc_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-liblirc_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files) $(config_DATA)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+liblirc_la_LDFLAGS = $(plugin_ldflags)
+liblirc_la_LIBADD = $(LIRC_LIBS)
+liblirc_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/media-player-keys/Makefile.am b/src/plugins/media-player-keys/Makefile.am
index af4b068..a5eed62 100644
--- a/src/plugins/media-player-keys/Makefile.am
+++ b/src/plugins/media-player-keys/Makefile.am
@@ -1,45 +1,31 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/media-player-keys
 plugin_LTLIBRARIES = libmedia_player_keys.la
 
 plugin_in_files = media-player-keys.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
+# Marshal files
 marshal_files = \
 	totem-marshal.h		\
 	totem-marshal.c
 
-libmedia_player_keys_la_SOURCES = totem-media-player-keys.c $(marshal_files)
-libmedia_player_keys_la_LDFLAGS = $(modules_flags)
-libmedia_player_keys_la_LIBADD = $(MEDIA_PLAYER_KEYS_LIBS)
-libmedia_player_keys_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-libmedia_player_keys_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(MEDIA_PLAYER_KEYS_CFLAGS) \
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-#Rule to generate the marshal files
 totem-marshal.c: totem-marshal.list
 	$(AM_V_GEN) @GLIB_GENMARSHAL@ --prefix=totem_marshal $< --header --body > $@
 
 totem-marshal.h: totem-marshal.list
 	$(AM_V_GEN) @GLIB_GENMARSHAL@ --prefix=totem_marshal $< --header > $@
 
-EXTRA_DIST = totem-marshal.list $(plugin_in_files)
+EXTRA_DIST += totem-marshal.list
+CLEANFILES += $(marshal_files)
 
-CLEANFILES = $(plugin_DATA) $(marshal_files)
-DISTCLEANFILES = $(plugin_DATA)
+libmedia_player_keys_la_SOURCES = \
+	$(marshal_files)		\
+	totem-media-player-keys.c
+libmedia_player_keys_la_LDFLAGS = $(plugin_ldflags)
+libmedia_player_keys_la_LIBADD = $(MEDIA_PLAYER_KEYS_LIBS)
+libmedia_player_keys_la_CFLAGS = \
+	$(plugin_cflags)		\
+	$(MEDIA_PLAYER_KEYS_CFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/mythtv/Makefile.am b/src/plugins/mythtv/Makefile.am
index 374326c..831d0cb 100644
--- a/src/plugins/mythtv/Makefile.am
+++ b/src/plugins/mythtv/Makefile.am
@@ -1,34 +1,18 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/mythtv
 plugin_LTLIBRARIES = libtotem_mythtv.la
 
 plugin_in_files = mythtv.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libtotem_mythtv_la_SOURCES = totem-mythtv.c
-libtotem_mythtv_la_LDFLAGS = $(modules_flags)
+libtotem_mythtv_la_LDFLAGS = $(plugin_ldflags)
 libtotem_mythtv_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins
+	$(AM_CPPFLAGS)			\
+	-I$(top_srcdir)/src/backend
 libtotem_mythtv_la_LIBADD = $(GMYTH_LIBS)
-
-libtotem_mythtv_la_CFLAGS =	\
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(GMYTH_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(noinst_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+libtotem_mythtv_la_CFLAGS = \
+	$(plugin_cflags)	\
+	$(GMYTH_CFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/ontop/Makefile.am b/src/plugins/ontop/Makefile.am
index 47f9332..9dc0aa7 100644
--- a/src/plugins/ontop/Makefile.am
+++ b/src/plugins/ontop/Makefile.am
@@ -1,33 +1,13 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/ontop
 plugin_LTLIBRARIES = libontop.la
 
 plugin_in_files = ontop.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libontop_la_SOURCES = totem-ontop.c
-libontop_la_LDFLAGS = $(modules_flags)
+libontop_la_LDFLAGS = $(plugin_ldflags)
 libontop_la_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
-libontop_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-libontop_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+libontop_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/opensubtitles/Makefile.am b/src/plugins/opensubtitles/Makefile.am
index 6117b61..9e09dd7 100644
--- a/src/plugins/opensubtitles/Makefile.am
+++ b/src/plugins/opensubtitles/Makefile.am
@@ -1,13 +1,13 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/opensubtitles
 plugin_PYTHON = opensubtitles.py hash.py
 
 plugin_in_files = opensubtitles.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = opensubtitles.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(ui_DATA)
 
 gsettings_SCHEMAS = org.gnome.totem.plugins.opensubtitles.gschema.xml
 
@@ -17,10 +17,10 @@ gsettings_SCHEMAS = org.gnome.totem.plugins.opensubtitles.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = opensubtitles.convert
 
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA) opensubtitles.py hash.py org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in opensubtitles.convert
+EXTRA_DIST += opensubtitles.py hash.py org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in opensubtitles.convert
 
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+CLEANFILES += $(gsettings_SCHEMAS)
+DISTCLEANFILES += $(gsettings_SCHEMAS)
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am
index 4615a8d..69e133e 100644
--- a/src/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -1,46 +1,24 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/properties
 plugin_LTLIBRARIES = libmovie-properties.la
 noinst_LTLIBRARIES = libbaconvideowidgetproperties.la
 
 plugin_in_files = movie-properties.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins
 
 libmovie_properties_la_SOURCES = totem-movie-properties.c
-libmovie_properties_la_LDFLAGS = $(modules_flags)
+libmovie_properties_la_LDFLAGS = $(plugin_ldflags)
 libmovie_properties_la_LIBADD = libbaconvideowidgetproperties.la
-libmovie_properties_la_CPPFLAGS = $(common_defines)
-
-libmovie_properties_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
+libmovie_properties_la_CFLAGS = $(plugin_cflags)
 
-libbaconvideowidgetproperties_la_SOURCES =		\
-	bacon-video-widget-properties.c			\
+libbaconvideowidgetproperties_la_SOURCES = \
+	bacon-video-widget-properties.c	\
 	bacon-video-widget-properties.h
-
-libbaconvideowidgetproperties_la_CPPFLAGS = $(common_defines)
-libbaconvideowidgetproperties_la_CFLAGS =	\
-	$(DEPENDENCY_CFLAGS)			\
-	$(WARN_CFLAGS)				\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+libbaconvideowidgetproperties_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)			\
+	-I$(top_srcdir)/src/backend
+libbaconvideowidgetproperties_la_CFLAGS = \
+	$(DEPENDENCY_CFLAGS)	\
+	$(WARN_CFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/publish/Makefile.am b/src/plugins/publish/Makefile.am
index bec14f5..d6d56e9 100644
--- a/src/plugins/publish/Makefile.am
+++ b/src/plugins/publish/Makefile.am
@@ -1,33 +1,23 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/publish
 plugin_LTLIBRARIES = libpublish.la
 
 plugin_in_files = publish.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(PLUGINDIR)/publish
 ui_DATA = publish-plugin.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(ui_DATA)
 
 libpublish_la_SOURCES = totem-publish.c
-libpublish_la_LDFLAGS = $(modules_flags)
+libpublish_la_LDFLAGS = $(plugin_ldflags)
 libpublish_la_LIBADD = $(LIBEPC_LIBS)
 libpublish_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins
-
+	$(AM_CPPFLAGS)			\
+	-I$(top_srcdir)/src/backend
 libpublish_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(LIBEPC_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
+	$(plugin_cflags)	\
+	$(LIBEPC_CFLAGS)
 
 gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
 
@@ -37,10 +27,10 @@ gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = publish.convert
 
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA) org.gnome.totem.plugins.publish.gschema.xml.in.in publish.convert
+EXTRA_DIST += org.gnome.totem.plugins.publish.gschema.xml.in.in publish.convert
 
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+CLEANFILES += $(gsettings_SCHEMAS)
+DISTCLEANFILES += $(gsettings_SCHEMAS)
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/pythonconsole/Makefile.am b/src/plugins/pythonconsole/Makefile.am
index 6384983..df78cd8 100644
--- a/src/plugins/pythonconsole/Makefile.am
+++ b/src/plugins/pythonconsole/Makefile.am
@@ -1,12 +1,10 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/pythonconsole
 plugin_PYTHON = pythonconsole.py console.py
 
 plugin_in_files = pythonconsole.totem-plugin.in
 
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
 gsettings_SCHEMAS = org.gnome.totem.plugins.pythonconsole.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -15,10 +13,10 @@ gsettings_SCHEMAS = org.gnome.totem.plugins.pythonconsole.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = pythonconsole.convert
 
-EXTRA_DIST = $(plugin_in_files) pythonconsole.py console.py org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in pythonconsole.convert
+EXTRA_DIST += pythonconsole.py console.py org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in pythonconsole.convert
 
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+CLEANFILES += $(gsettings_SCHEMAS)
+DISTCLEANFILES += $(gsettings_SCHEMAS)
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/sample-python/Makefile.am b/src/plugins/sample-python/Makefile.am
index 7147e8c..bc0dbae 100644
--- a/src/plugins/sample-python/Makefile.am
+++ b/src/plugins/sample-python/Makefile.am
@@ -1,15 +1,14 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
 plugindir = $(PLUGINDIR)/sample-python
-#plugin_PYTHON = sample-python.py
+plugin_PYTHON = sample-python.py
 
 plugin_in_files = sample-python.totem-plugin.in
-# Note: This isn't plugin_DATA so that we don't install the files (this is a _sample_ plugin)
-plugin_data = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-EXTRA_DIST = $(plugin_in_files) sample-python.py
+EXTRA_DIST += sample-python.py
 
-CLEANFILES = $(plugin_data)
-DISTCLEANFILES = $(plugin_data)
+# Override to _not_ install the test plugins
+install-pluginPYTHON:
+install-pluginDATA:
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/sample-vala/Makefile.am b/src/plugins/sample-vala/Makefile.am
index 70b2ba9..8701b95 100644
--- a/src/plugins/sample-vala/Makefile.am
+++ b/src/plugins/sample-vala/Makefile.am
@@ -1,50 +1,23 @@
-BUILT_SOURCES = totem-sample-vala-plugin.vala.stamp
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/sample-vala
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-plugin_in_files = sample-vala.totem-plugin.in
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 if ENABLE_VALA
-modules_flags = -export_dynamic -avoid-version -module
-
 plugin_LTLIBRARIES = libsample-vala.la
-# override to _not_ install the test plugins
-install-pluginLTLIBRARIES:
-
-libsample_vala_la_VALASOURCES = \
-	totem-sample-vala-plugin.vala
-
-libsample_vala_la_SOURCES = \
-	totem-sample-vala-plugin.vala.stamp \
-	$(libsample_vala_la_VALASOURCES:.vala=.c)
 
-libsample_vala_la_LDFLAGS = $(modules_flags)
-libsample_vala_la_CPPFLAGS = \
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-libsample_vala_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
+plugin_in_files = sample-vala.totem-plugin.in
 
-totem-sample-vala-plugin.vala.stamp: $(libsample_vala_la_VALASOURCES)
-	$(VALAC) $(VALAFLAGS) -C --vapidir=$(top_srcdir)/bindings/vala --pkg=totem $^
-	touch $@
+VALAFLAGS = \
+	--vapidir=$(top_srcdir)/bindings/vala	\
+	--pkg=totem
 
+libsample_vala_la_SOURCES = totem-sample-vala-plugin.vala
+libsample_vala_la_LDFLAGS = $(plugin_ldflags)
+libsample_vala_la_CFLAGS = $(plugin_cflags)
 endif
 
-EXTRA_DIST = $(plugin_in_files) $(libsample_vala_la_VALASOURCES) totem-sample-vala-plugin.vala.stamp
-
-MAINTAINERCLEANFILES = \
-	$(libsample_vala_la_VALASOURCES:.vala=.c)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+# Override to _not_ install the test plugins
+install-pluginLTLIBRARIES:
+install-pluginDATA:
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/screensaver/Makefile.am b/src/plugins/screensaver/Makefile.am
index 11a5f25..b247fcc 100644
--- a/src/plugins/screensaver/Makefile.am
+++ b/src/plugins/screensaver/Makefile.am
@@ -1,34 +1,18 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/screensaver
 plugin_LTLIBRARIES = libscreensaver.la
 
 plugin_in_files = screensaver.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libscreensaver_la_SOURCES = totem-screensaver.c
-libscreensaver_la_LDFLAGS = $(modules_flags)
+libscreensaver_la_LDFLAGS = $(plugin_ldflags)
 libscreensaver_la_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
 libscreensaver_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
+	$(AM_CPPFLAGS)		\
+	-I$(top_srcdir)/lib
 libscreensaver_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
+	$(plugin_cflags)	\
 	$(SCREENSAVER_CFLAGS)
 
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/screenshot/Makefile.am b/src/plugins/screenshot/Makefile.am
index 96e422d..fdb720b 100644
--- a/src/plugins/screenshot/Makefile.am
+++ b/src/plugins/screenshot/Makefile.am
@@ -1,15 +1,13 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/screenshot
 plugin_LTLIBRARIES = libscreenshot.la
 
 plugin_in_files = screenshot.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = gallery.ui gnome-screenshot.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(ui_DATA)
 
 libscreenshot_la_SOURCES = \
 	gnome-screenshot-widget.c	\
@@ -22,24 +20,7 @@ libscreenshot_la_SOURCES = \
 	totem-gallery.h			\
 	totem-gallery-progress.c	\
 	totem-gallery-progress.h
-libscreenshot_la_LDFLAGS = $(modules_flags)
-libscreenshot_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins	\
-	-I$(srcdir)/
-
-libscreenshot_la_CFLAGS = 		\
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(WARN_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+libscreenshot_la_LDFLAGS = $(plugin_ldflags)
+libscreenshot_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/sidebar-test/Makefile.am b/src/plugins/sidebar-test/Makefile.am
index db1e983..be59608 100644
--- a/src/plugins/sidebar-test/Makefile.am
+++ b/src/plugins/sidebar-test/Makefile.am
@@ -1,33 +1,16 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/sidebar-test
 plugin_LTLIBRARIES = libsidebar-test.la
-# override to _not_ install the test plugins
-install-pluginLTLIBRARIES:
 
 plugin_in_files = sidebar-test.totem-plugin.in
-noinst_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libsidebar_test_la_SOURCES = totem-sidebar-test.c
-libsidebar_test_la_LDFLAGS = $(modules_flags)
-libsidebar_test_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-libsidebar_test_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
+libsidebar_test_la_LDFLAGS = $(plugin_ldflags)
+libsidebar_test_la_CFLAGS = $(plugin_cflags)
 
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(noinst_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+# Override to _not_ install the test plugins
+install-pluginLTLIBRARIES:
+install-pluginDATA:
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/skipto/Makefile.am b/src/plugins/skipto/Makefile.am
index cae1c48..bbe21d7 100644
--- a/src/plugins/skipto/Makefile.am
+++ b/src/plugins/skipto/Makefile.am
@@ -1,15 +1,13 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/skipto
 plugin_LTLIBRARIES = libskipto.la
 
 plugin_in_files = skipto.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = skipto.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(ui_DATA)
 
 libskipto_la_SOURCES = \
 	totem-skipto-plugin.c	\
@@ -17,26 +15,10 @@ libskipto_la_SOURCES = \
 	totem-time-entry.h	\
 	totem-skipto.c		\
 	totem-skipto.h
-libskipto_la_LDFLAGS = $(modules_flags)
+libskipto_la_LDFLAGS = $(plugin_ldflags)
 libskipto_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins	\
-	-I$(srcdir)/
-
-libskipto_la_CFLAGS = 			\
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(WARN_CFLAGS)			\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+	$(AM_CPPFLAGS)			\
+	-I$(top_srcdir)/src/backend
+libskipto_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/thumbnail/Makefile.am b/src/plugins/thumbnail/Makefile.am
index 48e7dd3..fd27955 100644
--- a/src/plugins/thumbnail/Makefile.am
+++ b/src/plugins/thumbnail/Makefile.am
@@ -1,33 +1,12 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/thumbnail
 plugin_LTLIBRARIES = libthumbnail.la
 
 plugin_in_files = thumbnail.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libthumbnail_la_SOURCES = totem-thumbnail.c
-libthumbnail_la_LDFLAGS = $(modules_flags)
-libthumbnail_la_LIBADD = 
-libthumbnail_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-libthumbnail_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+libthumbnail_la_LDFLAGS = $(plugin_ldflags)
+libthumbnail_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 221a8ce..8c256c8 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -1,33 +1,16 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/tracker
 plugin_LTLIBRARIES = libtracker.la
 
 plugin_in_files = tracker.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 libtracker_la_SOURCES = totem-tracker.c totem-tracker-widget.h totem-tracker-widget.c
-libtracker_la_LDFLAGS = $(modules_flags)
+libtracker_la_LDFLAGS = $(plugin_ldflags)
 libtracker_la_LIBADD = $(TRACKER_LIBS)
-libtracker_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
 libtracker_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(plugin_cflags)	\
 	$(TRACKER_CFLAGS)	\
-	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)
 
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/youtube/Makefile.am b/src/plugins/youtube/Makefile.am
index f759f8b..b2b8e5b 100644
--- a/src/plugins/youtube/Makefile.am
+++ b/src/plugins/youtube/Makefile.am
@@ -1,39 +1,22 @@
-modules_flags = -export_dynamic -avoid-version -module
+include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/youtube
 plugin_LTLIBRARIES = libyoutube.la
 
 plugin_in_files = youtube.totem-plugin.in
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 uidir = $(plugindir)
 ui_DATA = youtube.ui
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+EXTRA_DIST += $(ui_DATA)
 
 libyoutube_la_SOURCES = totem-youtube.c
-libyoutube_la_LDFLAGS = $(modules_flags)
+libyoutube_la_LDFLAGS = $(plugin_ldflags)
 libyoutube_la_LIBADD = \
 	$(LIBGDATA_LIBS)	\
 	$(LIBSOUP_LIBS)
-libyoutube_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
 libyoutube_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(plugin_cflags)	\
 	$(LIBGDATA_CFLAGS)	\
-	$(LIBSOUP_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+	$(LIBSOUP_CFLAGS)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]