--- browser-plugin/Makefile.in.orig	2007-09-16 18:59:35.000000000 -0400
+++ browser-plugin/Makefile.in	2007-09-16 19:00:59.000000000 -0400
@@ -69,7 +69,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \
 @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
@@ -89,7 +89,7 @@
 	$(libtotem_basic_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(plugindir)
-@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
@@ -109,7 +109,7 @@
 	$(libtotem_complex_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath =  \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	-rpath $(plugindir)
-@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \
 @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
 @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
 @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
@@ -133,7 +133,7 @@
 	$(libtotem_gmp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \
 @ENABLE_GMP_PLUGIN_TRUE@	$(plugindir)
-@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \
 @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
@@ -153,7 +153,7 @@
 	$(libtotem_mully_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(plugindir)
-@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
@@ -198,10 +198,6 @@
 	totem_plugin_viewer-totem-plugin-viewer.$(OBJEXT)
 totem_plugin_viewer_OBJECTS = $(am_totem_plugin_viewer_OBJECTS)
 totem_plugin_viewer_DEPENDENCIES =  \
-	$(top_builddir)/src/backend/libbaconvideowidget.la \
-	$(top_builddir)/src/libtotem_player.la \
-	$(top_builddir)/src/plparse/libtotem-plparser.la \
-	$(top_builddir)/lib/libtotemscrsaver.la \
 	libtotempluginviewer_helper.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -381,7 +377,7 @@
 MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
 MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@
 MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@
-MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@
+MOZILLA_PLUGINDIR = $(libdir)/browser_plugins
 MOZILLA_PREFIX = @MOZILLA_PREFIX@
 MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@
 MOZILLA_XPIDL = @MOZILLA_XPIDL@
@@ -599,10 +595,7 @@
 	$(AM_CFLAGS)
 
 totem_plugin_viewer_LDADD = \
-	$(top_builddir)/src/backend/libbaconvideowidget.la		\
-	$(top_builddir)/src/libtotem_player.la				\
-	$(top_builddir)/src/plparse/libtotem-plparser.la		\
-	$(top_builddir)/lib/libtotemscrsaver.la				\
+	-ltotem-plparser \
 	libtotempluginviewer_helper.la					\
 	$(EXTRA_GNOME_LIBS)	\
 	$(XVIDMODE_LIBS) 	\
@@ -654,7 +647,7 @@
 @ENABLE_BASIC_PLUGIN_TRUE@	$(AM_CXXFLAGS)
 
 @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \
-@ENABLE_BASIC_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
+@ENABLE_BASIC_PLUGIN_TRUE@	-ltotem-plparser \
 @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
 @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_LIBS)	\
 @ENABLE_BASIC_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
@@ -715,7 +708,7 @@
 @ENABLE_GMP_PLUGIN_TRUE@	$(AM_CXXFLAGS)
 
 @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \
-@ENABLE_GMP_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
+@ENABLE_GMP_PLUGIN_TRUE@	-ltotem-plparser \
 @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_helper.la	\
 @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_LIBS)	\
 @ENABLE_GMP_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
@@ -770,7 +763,7 @@
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(AM_CXXFLAGS)
 
 @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \
-@ENABLE_COMPLEX_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
+@ENABLE_COMPLEX_PLUGIN_TRUE@	-ltotem-plparser
 @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_LIBS)	\
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
@@ -825,7 +818,7 @@
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(AM_CXXFLAGS)
 
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \
-@ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
+@ENABLE_NARROWSPACE_PLUGIN_TRUE@	-ltotem-plparser \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_LIBS)	\
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
@@ -880,7 +873,7 @@
 @ENABLE_MULLY_PLUGIN_TRUE@	$(AM_CXXFLAGS)
 
 @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \
-@ENABLE_MULLY_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
+@ENABLE_MULLY_PLUGIN_TRUE@	-ltotem-plparser \
 @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
 @ENABLE_MULLY_PLUGIN_TRUE@	$(DBUS_LIBS)	\
 @ENABLE_MULLY_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\