rhythmbox r5977 - in trunk: . corelib shell

[hadess svn gnome org]

Author: hadess
Date: Sun Oct 12 16:03:13 2008
New Revision: 5977
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5977&view=rev

Log:
2008-10-12  Bastien Nocera  <hadess hadess net>

	* corelib/Makefile.am:
	* shell/Makefile.am: Link the corelib against gnome-media-profiles,
	not the shell itself, otherwise we end up with missing symbols that
	aren't from the rb shell
	(see https://bugzilla.redhat.com/show_bug.cgi?id=466651)



Modified:
   trunk/ChangeLog
   trunk/corelib/Makefile.am
   trunk/shell/Makefile.am

Modified: trunk/corelib/Makefile.am
==============================================================================
--- trunk/corelib/Makefile.am	(original)
+++ trunk/corelib/Makefile.am	Sun Oct 12 16:03:13 2008
@@ -13,5 +13,9 @@
 	$(top_builddir)/backends/librbbackends.la	\
 	$(top_builddir)/lib/librb.la
 
+if ENABLE_TRACK_TRANSFER
+librhythmbox_core_la_LIBADD += $(GNOME_MEDIA_PROFILES_LIBS)
+endif
+
 librhythmbox_core_la_LDFLAGS = -export-dynamic
 

Modified: trunk/shell/Makefile.am
==============================================================================
--- trunk/shell/Makefile.am	(original)
+++ trunk/shell/Makefile.am	Sun Oct 12 16:03:13 2008
@@ -116,11 +116,6 @@
 rhythmbox_LDADD += $(PYTHON_LIBS) $(top_builddir)/bindings/python/rb.la
 endif
 
-if ENABLE_TRACK_TRANSFER
-rhythmbox_LDADD += $(GNOME_MEDIA_PROFILES_LIBS)
-INCLUDES += $(GNOME_MEDIA_PROFILES_CFLAGS)
-endif
-
 rb-shell-glue.h: rb-shell.xml Makefile
 	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=rb_shell --mode=glib-server --output=$@ $<
 rb-shell-player-glue.h: rb-shell-player.xml Makefile