Index: totem-1.2.1/src/backend/Makefile.am
===================================================================
--- totem-1.2.1.orig/src/backend/Makefile.am
+++ totem-1.2.1/src/backend/Makefile.am
@@ -12,8 +12,8 @@ bvw_test_CFLAGS = \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\"
 bvw_test_LDADD = \
-	$(X_LIBS) $(GTK_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) \
-	libbaconvideowidget.la
+	libbaconvideowidget.la \
+	$(X_LIBS) $(GTK_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS)
 
 if TOTEM_GST
 MM = bacon-video-widget-gst.c \
Index: totem-1.2.1/src/Makefile.am
===================================================================
--- totem-1.2.1.orig/src/Makefile.am
+++ totem-1.2.1/src/Makefile.am
@@ -96,16 +96,17 @@ totem_SOURCES = 					\
 	ev-sidebar.c ev-sidebar.h
 
 totem_LDADD = \
-	$(X_LIBS) $(EXTRA_GNOME_LIBS) $(XTEST_LIBS) $(REMOTE_LIBS) \
-	$(MUSICBRAINZ_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) \
 	plparse/libtotem-plparser.la backend/libbaconvideowidget.la \
 	libbaconpropertiespage.la libbaconmessageconnection.la \
+	$(X_LIBS) $(EXTRA_GNOME_LIBS) $(XTEST_LIBS) $(REMOTE_LIBS) \
+	$(MUSICBRAINZ_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) \
 	$(DBUS_LIBS) 
 
 totem_video_thumbnailer_SOURCES = totem-video-thumbnailer.c
 totem_video_thumbnailer_LDADD = \
+	backend/libbaconvideowidget.la \
 	$(X_LIBS) $(GTK_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) \
-	$(NVTV_LIBS) $(EXTRA_GNOME_LIBS) backend/libbaconvideowidget.la
+	$(NVTV_LIBS) $(EXTRA_GNOME_LIBS)
 
 nautilusdir = $(libdir)/nautilus/extensions-1.0/
 libtotem_properties_page_la_CFLAGS = -I$(top_srcdir)
@@ -115,9 +116,10 @@ libtotem_properties_page_la_SOURCES = 	\
 	totem-properties-view.h
 
 libtotem_properties_page_la_LIBADD = \
+	backend/libbaconvideowidget.la libbaconpropertiespage.la \
 	$(X_LIBS) $(EXTRA_GNOME_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) \
-	$(NVTV_LIBS) $(NAUTILUS_LIBS) \
-	backend/libbaconvideowidget.la libbaconpropertiespage.la
+	$(NVTV_LIBS) $(NAUTILUS_LIBS)
+
 libtotem_properties_page_la_LDFLAGS = $(module_flags)
 
 if HAVE_MOZILLA
@@ -157,9 +159,9 @@ totem_mozilla_viewer_SOURCES = 		\
 	totem-mozilla-options.h		\
 	bacon-volume.c bacon-volume.h
 totem_mozilla_viewer_LDADD = \
+	backend/libbaconvideowidget.la libbaconpropertiespage.la \
 	$(X_LIBS) $(EXTRA_GNOME_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) \
-	$(DBUS_LIBS) $(NVTV_LIBS) \
-	backend/libbaconvideowidget.la libbaconpropertiespage.la
+	$(DBUS_LIBS) $(NVTV_LIBS)
 
 module_flags = -export_dynamic -avoid-version
 
@@ -175,18 +177,20 @@ vanity_SOURCES =					\
 	vanity.c
 
 vanity_LDADD = \
+	backend/libbaconvideowidget.la \
 	$(X_LIBS) $(EXTRA_GNOME_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) \
-	$(NVTV_LIBS) backend/libbaconvideowidget.la
+	$(NVTV_LIBS)
 
 metadata_test_SOURCES = metadata-test.c
 metadata_test_LDADD = \
+	backend/libbaconvideowidget.la \
 	$(X_LIBS) $(GTK_LIBS) $(XTEST_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) \
-	$(EXTRA_GNOME_LIBS) backend/libbaconvideowidget.la
+	$(EXTRA_GNOME_LIBS)
 
 disc_test_SOURCES = disc-test.c
 disc_test_LDADD = \
-	$(GTK_LIBS) $(EXTRA_GNOME_LIBS) \
-	plparse/libtotem-plparser.la
+	plparse/libtotem-plparser.la \
+	$(GTK_LIBS) $(EXTRA_GNOME_LIBS)
 
 list_v4l_SOURCES = list_v4l.c $(BACON_V4L_SELECTION)
 list_v4l_LDADD = $(GTK_LIBS)