[rygel] build: Correct linker argument order

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit e13e597cc16ef95f1e741f8679ce23b33dfa4a8b
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Dec 29 17:58:03 2009 +0200

    build: Correct linker argument order
    
    This should fix the build issue on Gentoo.

 src/rygel/Makefile.am |    7 ++++---
 src/ui/Makefile.am    |   22 +++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 379dfd7..e83b227 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -99,7 +99,8 @@ rygel_VALAFLAGS = \
 	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
 	--pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 --pkg sqlite3 -g
 
-rygel_LDADD = $(LIBGUPNP_LIBS) \
+rygel_LDADD = librygel-configuration.a \
+	      $(LIBGUPNP_LIBS) \
 	      $(LIBGUPNP_AV_LIBS) \
 	      $(LIBGSTREAMER_LIBS) \
 	      $(GIO_LIBS) \
@@ -107,8 +108,8 @@ rygel_LDADD = $(LIBGUPNP_LIBS) \
 	      $(UUID_LIBS) \
 	      $(LIBSOUP_LIBS) \
 	      $(LIBDBUS_GLIB_LIBS) \
-	      $(LIBSQLITE3_LIBS) \
-	      librygel-configuration.a
+	      $(LIBSQLITE3_LIBS)
+
 rygel_LDFLAGS = -export-dynamic
 
 VAPI_FILES = rygel-1.0.vapi
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 5882c31..ece8e78 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -35,17 +35,17 @@ rygel_preferences_VALAFLAGS = \
 	--pkg dbus-glib-1 --pkg gconf-2.0 --pkg gstreamer-0.10 \
 	--pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0 -g
 
-rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
-                          $(LIBGUPNP_AV_LIBS) \
-                          $(LIBGSTREAMER_LIBS) \
-                          $(GIO_LIBS) \
-                          $(GEE_LIBS) \
-                          $(UUID_LIBS) \
-                          $(LIBSOUP_LIBS) \
-                          $(GTK_LIBS) \
-                          $(LIBDBUS_GLIB_LIBS) \
-                          -L$(abs_top_builddir)/src/rygel \
-                          -lrygel-configuration
+rygel_preferences_LDADD = \
+		$(abs_top_builddir)/src/rygel/librygel-configuration.a \
+		$(LIBGUPNP_LIBS) \
+		$(LIBGUPNP_AV_LIBS) \
+		$(LIBGSTREAMER_LIBS) \
+		$(GIO_LIBS) \
+		$(GEE_LIBS) \
+		$(UUID_LIBS) \
+		$(LIBSOUP_LIBS) \
+		$(GTK_LIBS) \
+		$(LIBDBUS_GLIB_LIBS)
 rygel_preferences_LDFLAGS = -export-dynamic
 
 MAINTAINERCLEANFILES = Makefile.in