[totem] Clean up plugin makefiles

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [totem] Clean up plugin makefiles
Date: Sun, 5 Sep 2010 12:24:19 +0000 (UTC)
commit d8cd4963d1642d4d5e72024012c9cf6c04052e89
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 10:53:38 2010 +0100

    Clean up plugin makefiles

 src/plugins/bemused/Makefile.am               |   24 +++++++-----------
 src/plugins/brasero-disc-recorder/Makefile.am |   24 +++++++-----------
 src/plugins/chapters/Makefile.am              |   22 +++++++----------
 src/plugins/coherence_upnp/Makefile.am        |    4 +--
 src/plugins/dbus-service/Makefile.am          |    4 +--
 src/plugins/galago/Makefile.am                |   22 +++++++----------
 src/plugins/gromit/Makefile.am                |   24 +++++++-----------
 src/plugins/iplayer/Makefile.am               |    9 ++++---
 src/plugins/jamendo/Makefile.am               |    9 ++++---
 src/plugins/lirc/Makefile.am                  |   24 +++++++-----------
 src/plugins/media-player-keys/Makefile.am     |   32 +++++++++++--------------
 src/plugins/mythtv/Makefile.am                |   24 +++++++-----------
 src/plugins/ontop/Makefile.am                 |   24 +++++++-----------
 src/plugins/opensubtitles/Makefile.am         |    8 +++---
 src/plugins/properties/Makefile.am            |   27 +++++++-------------
 src/plugins/publish/Makefile.am               |   26 ++++++++-----------
 src/plugins/sample-python/Makefile.am         |    5 +--
 src/plugins/sample-vala/Makefile.am           |   17 +++++-------
 src/plugins/screensaver/Makefile.am           |   24 +++++++-----------
 src/plugins/screenshot/Makefile.am            |   28 +++++++++------------
 src/plugins/sidebar-test/Makefile.am          |   22 +++++++----------
 src/plugins/skipto/Makefile.am                |   30 ++++++++++-------------
 src/plugins/thumbnail/Makefile.am             |   24 +++++++-----------
 src/plugins/tracker/Makefile.am               |   22 +++++++----------
 src/plugins/youtube/Makefile.am               |   26 ++++++++-----------
 25 files changed, 212 insertions(+), 293 deletions(-)
---
diff --git a/src/plugins/bemused/Makefile.am b/src/plugins/bemused/Makefile.am
index 13de862..29f9a3e 100644
--- a/src/plugins/bemused/Makefile.am
+++ b/src/plugins/bemused/Makefile.am
@@ -4,34 +4,30 @@ 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
 
-noinst_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
-
 libbemused_la_SOURCES = totem-bemused.c
 libbemused_la_LDFLAGS = $(modules_flags)
-libbemused_la_CPPFLAGS = $(common_defines)
+libbemused_la_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""Totem"\"	\
+	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir)/		\
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/backend
 libbemused_la_LIBADD = $(BEMUSED_LIBS)
 
 libbemused_la_CFLAGS =			\
 	$(DEPENDENCY_CFLAGS)		\
 	$(PEAS_CFLAGS)			\
 	$(WARN_CFLAGS)			\
-	$(BEMUSED_CFLAGS)		\
-	$(AM_CFLAGS)			\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins	\
-	-I$(top_srcdir)/src/backend
+	$(BEMUSED_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(noinst_DATA) $(BUILT_SOURCES)
+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 0110c3a..01ebce0 100644
--- a/src/plugins/brasero-disc-recorder/Makefile.am
+++ b/src/plugins/brasero-disc-recorder/Makefile.am
@@ -4,35 +4,31 @@ plugindir = $(PLUGINDIR)/brasero-disc-recorder
 plugin_LTLIBRARIES = libbrasero-disc-recorder.la
 
 plugin_in_files = brasero-disc-recorder.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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_LIBADD = $(DISC_RECORDER_LIBS)
-libbrasero_disc_recorder_la_CPPFLAGS = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	$(DISC_RECORDER_CFLAGS)	\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DISC_RECORDER_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+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 150da0e..f56c091 100644
--- a/src/plugins/chapters/Makefile.am
+++ b/src/plugins/chapters/Makefile.am
@@ -4,37 +4,33 @@ plugindir = $(PLUGINDIR)/chapters
 plugin_LTLIBRARIES = libchapters.la
 
 plugin_in_files = chapters.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)
 
 uidir = $(plugindir)
 ui_DATA = chapters-list.ui chapters-edit.ui
 
-common_defines = \
-	$(DISABLE_DEPRECATED)
+%.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)
 libchapters_la_LIBADD = $(CHAPTERS_LIBS)
-libchapters_la_CPPFLAGS = $(common_defines)
+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)			\
-	$(AM_CFLAGS)			\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/coherence_upnp/Makefile.am b/src/plugins/coherence_upnp/Makefile.am
index 016d87a..f836085 100644
--- a/src/plugins/coherence_upnp/Makefile.am
+++ b/src/plugins/coherence_upnp/Makefile.am
@@ -1,13 +1,11 @@
 plugindir = $(PLUGINDIR)/coherence_upnp
-uidir = $(plugindir)
 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
 
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
 EXTRA_DIST = $(plugin_in_files) coherence_upnp.py
 
 CLEANFILES = $(plugin_DATA)
diff --git a/src/plugins/dbus-service/Makefile.am b/src/plugins/dbus-service/Makefile.am
index 16c7a08..9358f89 100644
--- a/src/plugins/dbus-service/Makefile.am
+++ b/src/plugins/dbus-service/Makefile.am
@@ -1,13 +1,11 @@
 plugindir = $(PLUGINDIR)/dbus
-uidir = $(plugindir)
 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
 
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
 EXTRA_DIST = $(plugin_in_files) dbus-service.py
 
 CLEANFILES = $(plugin_DATA)
diff --git a/src/plugins/galago/Makefile.am b/src/plugins/galago/Makefile.am
index 69989da..d4a8217 100644
--- a/src/plugins/galago/Makefile.am
+++ b/src/plugins/galago/Makefile.am
@@ -4,34 +4,30 @@ plugindir = $(PLUGINDIR)/galago
 plugin_LTLIBRARIES = libtgp.la
 
 plugin_in_files = galago.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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_LIBADD = $(LIBGALAGO_LIBS)
-libtgp_la_CPPFLAGS = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/gromit/Makefile.am b/src/plugins/gromit/Makefile.am
index f711343..42c21b1 100644
--- a/src/plugins/gromit/Makefile.am
+++ b/src/plugins/gromit/Makefile.am
@@ -4,34 +4,30 @@ plugindir = $(PLUGINDIR)/gromit
 plugin_LTLIBRARIES = libgromit.la
 
 plugin_in_files = gromit.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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 = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/iplayer/Makefile.am b/src/plugins/iplayer/Makefile.am
index affa71a..34348b9 100644
--- a/src/plugins/iplayer/Makefile.am
+++ b/src/plugins/iplayer/Makefile.am
@@ -1,13 +1,14 @@
 plugindir = $(PLUGINDIR)/iplayer
-uidir = $(plugindir)
 plugin_PYTHON = iplayer.py iplayer2.py listparser.py
-plugin_in_files = iplayer.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_in_files = iplayer.totem-plugin.in
 plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
+
+uidir = $(plugindir)
 ui_DATA = iplayer.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 = $(plugin_in_files) $(ui_DATA) $(plugin_PYTHON)
 
 CLEANFILES = $(plugin_DATA)
diff --git a/src/plugins/jamendo/Makefile.am b/src/plugins/jamendo/Makefile.am
index 1a0a674..d36aa5a 100644
--- a/src/plugins/jamendo/Makefile.am
+++ b/src/plugins/jamendo/Makefile.am
@@ -1,13 +1,14 @@
 plugindir = $(PLUGINDIR)/jamendo
-uidir = $(plugindir)
 plugin_PYTHON = jamendo.py
-plugin_in_files = jamendo.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_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
+
 gsettings_SCHEMAS = org.gnome.totem.plugins.jamendo.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/src/plugins/lirc/Makefile.am b/src/plugins/lirc/Makefile.am
index b4e90d6..a61b336 100644
--- a/src/plugins/lirc/Makefile.am
+++ b/src/plugins/lirc/Makefile.am
@@ -4,37 +4,33 @@ plugindir = $(PLUGINDIR)/lirc
 plugin_LTLIBRARIES = liblirc.la
 
 plugin_in_files = lirc.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)
 
 configdir = $(PLUGINDIR)/lirc
 config_DATA = totem_lirc_default
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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
 
 liblirc_la_SOURCES = totem-lirc.c
 liblirc_la_LDFLAGS = $(modules_flags)
 liblirc_la_LIBADD = $(LIRC_LIBS) 
-liblirc_la_CPPFLAGS = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files) $(config_DATA)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/media-player-keys/Makefile.am b/src/plugins/media-player-keys/Makefile.am
index 70b7789..af4b068 100644
--- a/src/plugins/media-player-keys/Makefile.am
+++ b/src/plugins/media-player-keys/Makefile.am
@@ -4,35 +4,31 @@ 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
 
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+marshal_files = \
+	totem-marshal.h		\
+	totem-marshal.c
 
-libmedia_player_keys_la_SOURCES = totem-media-player-keys.c $(BUILT_SOURCES)
+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 = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
-
-BUILT_SOURCES =			\
-	totem-marshal.h		\
-	totem-marshal.c
+	$(DBUS_CFLAGS)
 
 #Rule to generate the marshal files
 totem-marshal.c: totem-marshal.list
@@ -43,7 +39,7 @@ totem-marshal.h: totem-marshal.list
 
 EXTRA_DIST = totem-marshal.list $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA) $(marshal_files)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/mythtv/Makefile.am b/src/plugins/mythtv/Makefile.am
index 1add8c8..374326c 100644
--- a/src/plugins/mythtv/Makefile.am
+++ b/src/plugins/mythtv/Makefile.am
@@ -4,18 +4,19 @@ plugindir = $(PLUGINDIR)/mythtv
 plugin_LTLIBRARIES = libtotem_mythtv.la
 
 plugin_in_files = mythtv.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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_CPPFLAGS = $(common_defines)
+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
 libtotem_mythtv_la_LIBADD = $(GMYTH_LIBS)
 
 libtotem_mythtv_la_CFLAGS =	\
@@ -23,16 +24,11 @@ libtotem_mythtv_la_CFLAGS =	\
 	$(PEAS_CFLAGS)		\
 	$(GMYTH_CFLAGS)		\
 	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/backend \
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(noinst_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(noinst_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/ontop/Makefile.am b/src/plugins/ontop/Makefile.am
index 918a3f0..47f9332 100644
--- a/src/plugins/ontop/Makefile.am
+++ b/src/plugins/ontop/Makefile.am
@@ -4,34 +4,30 @@ plugindir = $(PLUGINDIR)/ontop
 plugin_LTLIBRARIES = libontop.la
 
 plugin_in_files = ontop.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
-libontop_la_CPPFLAGS = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/opensubtitles/Makefile.am b/src/plugins/opensubtitles/Makefile.am
index 7e2f2f3..6117b61 100644
--- a/src/plugins/opensubtitles/Makefile.am
+++ b/src/plugins/opensubtitles/Makefile.am
@@ -1,14 +1,14 @@
 plugindir = $(PLUGINDIR)/opensubtitles
-uidir = $(plugindir)
 plugin_PYTHON = opensubtitles.py hash.py
 
 plugin_in_files = opensubtitles.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)
+
+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
+
 gsettings_SCHEMAS = org.gnome.totem.plugins.opensubtitles.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/src/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am
index 02bb923..4615a8d 100644
--- a/src/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -2,18 +2,20 @@ modules_flags = -export_dynamic -avoid-version -module
 
 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
 
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
 common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+	-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)
@@ -24,11 +26,7 @@ libmovie_properties_la_CFLAGS = \
 	$(DEPENDENCY_CFLAGS)	\
 	$(PEAS_CFLAGS)		\
 	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 libbaconvideowidgetproperties_la_SOURCES =		\
 	bacon-video-widget-properties.c			\
@@ -38,16 +36,11 @@ libbaconvideowidgetproperties_la_CPPFLAGS = $(common_defines)
 libbaconvideowidgetproperties_la_CFLAGS =	\
 	$(DEPENDENCY_CFLAGS)			\
 	$(WARN_CFLAGS)				\
-	$(DBUS_CFLAGS)				\
-	$(AM_CFLAGS)				\
-	-I$(top_srcdir)/			\
-	-I$(top_srcdir)/src			\
-	-I$(top_srcdir)/src/backend		\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/publish/Makefile.am b/src/plugins/publish/Makefile.am
index 9b5dbd2..bec14f5 100644
--- a/src/plugins/publish/Makefile.am
+++ b/src/plugins/publish/Makefile.am
@@ -3,35 +3,31 @@ modules_flags = -export_dynamic -avoid-version -module
 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
 
-plugin_in_files = publish.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)
-
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
-
 libpublish_la_SOURCES = totem-publish.c
 libpublish_la_LDFLAGS = $(modules_flags)
 libpublish_la_LIBADD = $(LIBEPC_LIBS)
-libpublish_la_CPPFLAGS = $(common_defines)
+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
 
 libpublish_la_CFLAGS = \
 	$(DEPENDENCY_CFLAGS)	\
 	$(PEAS_CFLAGS)		\
 	$(LIBEPC_CFLAGS)	\
 	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/backend	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
 
diff --git a/src/plugins/sample-python/Makefile.am b/src/plugins/sample-python/Makefile.am
index 0c77f89..7147e8c 100644
--- a/src/plugins/sample-python/Makefile.am
+++ b/src/plugins/sample-python/Makefile.am
@@ -2,12 +2,11 @@ plugindir = $(PLUGINDIR)/sample-python
 #plugin_PYTHON = sample-python.py
 
 plugin_in_files = sample-python.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
-
 # 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
 
 CLEANFILES = $(plugin_data)
diff --git a/src/plugins/sample-vala/Makefile.am b/src/plugins/sample-vala/Makefile.am
index 6ab9480..70b2ba9 100644
--- a/src/plugins/sample-vala/Makefile.am
+++ b/src/plugins/sample-vala/Makefile.am
@@ -13,9 +13,6 @@ plugin_LTLIBRARIES = libsample-vala.la
 # override to _not_ install the test plugins
 install-pluginLTLIBRARIES:
 
-common_defines = \
-	$(DISABLE_DEPRECATED)
-
 libsample_vala_la_VALASOURCES = \
 	totem-sample-vala-plugin.vala
 
@@ -24,17 +21,17 @@ libsample_vala_la_SOURCES = \
 	$(libsample_vala_la_VALASOURCES:.vala=.c)
 
 libsample_vala_la_LDFLAGS = $(modules_flags)
-libsample_vala_la_CPPFLAGS = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 totem-sample-vala-plugin.vala.stamp: $(libsample_vala_la_VALASOURCES)
 	$(VALAC) $(VALAFLAGS) -C --vapidir=$(top_srcdir)/bindings/vala --pkg=totem $^
diff --git a/src/plugins/screensaver/Makefile.am b/src/plugins/screensaver/Makefile.am
index 181888d..11a5f25 100644
--- a/src/plugins/screensaver/Makefile.am
+++ b/src/plugins/screensaver/Makefile.am
@@ -4,35 +4,31 @@ plugindir = $(PLUGINDIR)/screensaver
 plugin_LTLIBRARIES = libscreensaver.la
 
 plugin_in_files = screensaver.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
-libscreensaver_la_CPPFLAGS = $(common_defines)
+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
 
 libscreensaver_la_CFLAGS = \
 	$(DEPENDENCY_CFLAGS)	\
 	$(PEAS_CFLAGS)		\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	$(SCREENSAVER_CFLAGS)	\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(SCREENSAVER_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+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 ff478c1..96e422d 100644
--- a/src/plugins/screenshot/Makefile.am
+++ b/src/plugins/screenshot/Makefile.am
@@ -1,19 +1,15 @@
 modules_flags = -export_dynamic -avoid-version -module
 
 plugindir = $(PLUGINDIR)/screenshot
-uidir = $(plugindir)
 plugin_LTLIBRARIES = libscreenshot.la
 
 plugin_in_files = screenshot.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)
+
+uidir = $(plugindir)
 ui_DATA = gallery.ui gnome-screenshot.ui
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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
 
 libscreenshot_la_SOURCES = \
 	gnome-screenshot-widget.c	\
@@ -28,22 +24,22 @@ libscreenshot_la_SOURCES = \
 	totem-gallery-progress.h
 libscreenshot_la_LDFLAGS = $(modules_flags)
 libscreenshot_la_CPPFLAGS = \
-	$(common_defines)		\
-	-I$(top_srcdir)/src/backend
-
-libscreenshot_la_CFLAGS = 		\
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(WARN_CFLAGS)			\
-	$(AM_CFLAGS)			\
+	-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) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/sidebar-test/Makefile.am b/src/plugins/sidebar-test/Makefile.am
index f1aba60..db1e983 100644
--- a/src/plugins/sidebar-test/Makefile.am
+++ b/src/plugins/sidebar-test/Makefile.am
@@ -6,32 +6,28 @@ plugin_LTLIBRARIES = libsidebar-test.la
 install-pluginLTLIBRARIES:
 
 plugin_in_files = sidebar-test.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
-
 noinst_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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 = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(noinst_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(noinst_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/skipto/Makefile.am b/src/plugins/skipto/Makefile.am
index 1f889e8..cae1c48 100644
--- a/src/plugins/skipto/Makefile.am
+++ b/src/plugins/skipto/Makefile.am
@@ -1,19 +1,15 @@
 modules_flags = -export_dynamic -avoid-version -module
 
 plugindir = $(PLUGINDIR)/skipto
-uidir = $(plugindir)
 plugin_LTLIBRARIES = libskipto.la
 
 plugin_in_files = skipto.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)
+
+uidir = $(plugindir)
 ui_DATA = skipto.ui
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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
 
 libskipto_la_SOURCES = \
 	totem-skipto-plugin.c	\
@@ -23,24 +19,24 @@ libskipto_la_SOURCES = \
 	totem-skipto.h
 libskipto_la_LDFLAGS = $(modules_flags)
 libskipto_la_CPPFLAGS = \
-	$(common_defines)		\
-	-I$(top_srcdir)/src/backend
-
-libskipto_la_CFLAGS = 			\
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(WARN_CFLAGS)			\
-	$(DBUS_CFLAGS)			\
-	$(AM_CFLAGS)			\
+	-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) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/thumbnail/Makefile.am b/src/plugins/thumbnail/Makefile.am
index 8afad61..48e7dd3 100644
--- a/src/plugins/thumbnail/Makefile.am
+++ b/src/plugins/thumbnail/Makefile.am
@@ -4,34 +4,30 @@ plugindir = $(PLUGINDIR)/thumbnail
 plugin_LTLIBRARIES = libthumbnail.la
 
 plugin_in_files = thumbnail.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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 = $(common_defines)
+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)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 298b5bb..221a8ce 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -4,34 +4,30 @@ plugindir = $(PLUGINDIR)/tracker
 plugin_LTLIBRARIES = libtracker.la
 
 plugin_in_files = tracker.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)
 
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
+%.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_LIBADD = $(TRACKER_LIBS)
-libtracker_la_CPPFLAGS = $(common_defines)
+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)		\
 	$(TRACKER_CFLAGS)	\
 	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+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 c1e1ff5..f759f8b 100644
--- a/src/plugins/youtube/Makefile.am
+++ b/src/plugins/youtube/Makefile.am
@@ -3,25 +3,25 @@ modules_flags = -export_dynamic -avoid-version -module
 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
 
-plugin_in_files = youtube.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)
-
-common_defines = \
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
-
 libyoutube_la_SOURCES = totem-youtube.c
 libyoutube_la_LDFLAGS = $(modules_flags)
 libyoutube_la_LIBADD = \
 	$(LIBGDATA_LIBS)	\
 	$(LIBSOUP_LIBS)
-libyoutube_la_CPPFLAGS = $(common_defines)
+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)	\
@@ -29,15 +29,11 @@ libyoutube_la_CFLAGS = \
 	$(LIBGDATA_CFLAGS)	\
 	$(LIBSOUP_CFLAGS)	\
 	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir)/	\
-	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/src/plugins
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 
-CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]