[totem] Fix plugins' LIBADD and CFLAGS variables

[Philip Withnall <pwithnall src gnome org>]

commit adc6fc33cf9ce71c13acbe7c4d78491a9beba497
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 12:13:07 2010 +0100

    Fix plugins' LIBADD and CFLAGS variables

 src/plugins/lirc/Makefile.am        |    4 +++-
 src/plugins/ontop/Makefile.am       |    1 -
 src/plugins/screensaver/Makefile.am |    4 +++-
 src/plugins/tracker/Makefile.am     |    4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/lirc/Makefile.am b/src/plugins/lirc/Makefile.am
index 41a1722..5717ff1 100644
--- a/src/plugins/lirc/Makefile.am
+++ b/src/plugins/lirc/Makefile.am
@@ -12,6 +12,8 @@ EXTRA_DIST += $(config_DATA)
 liblirc_la_SOURCES = totem-lirc.c
 liblirc_la_LDFLAGS = $(plugin_ldflags)
 liblirc_la_LIBADD = $(LIRC_LIBS)
-liblirc_la_CFLAGS = $(plugin_cflags)
+liblirc_la_CFLAGS = \
+	$(plugin_cflags)	\
+	$(LIRC_CFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/ontop/Makefile.am b/src/plugins/ontop/Makefile.am
index 9dc0aa7..142e4b4 100644
--- a/src/plugins/ontop/Makefile.am
+++ b/src/plugins/ontop/Makefile.am
@@ -7,7 +7,6 @@ plugin_in_files = ontop.totem-plugin.in
 
 libontop_la_SOURCES = totem-ontop.c
 libontop_la_LDFLAGS = $(plugin_ldflags)
-libontop_la_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
 libontop_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/screensaver/Makefile.am b/src/plugins/screensaver/Makefile.am
index b247fcc..c06af87 100644
--- a/src/plugins/screensaver/Makefile.am
+++ b/src/plugins/screensaver/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = screensaver.totem-plugin.in
 
 libscreensaver_la_SOURCES = totem-screensaver.c
 libscreensaver_la_LDFLAGS = $(plugin_ldflags)
-libscreensaver_la_LIBADD = $(top_builddir)/lib/libtotemscrsaver.la
+libscreensaver_la_LIBADD = \
+	$(top_builddir)/lib/libtotemscrsaver.la	\
+	$(SCREENSAVER_LIBS)
 libscreensaver_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)		\
 	-I$(top_srcdir)/lib
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 8c256c8..f699299 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = tracker.totem-plugin.in
 
 libtracker_la_SOURCES = totem-tracker.c totem-tracker-widget.h totem-tracker-widget.c
 libtracker_la_LDFLAGS = $(plugin_ldflags)
-libtracker_la_LIBADD = $(TRACKER_LIBS)
+libtracker_la_LIBADD = \
+	$(TRACKER_LIBS)	\
+	$(DBUS_LIBS)
 libtracker_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(TRACKER_CFLAGS)	\