[rhythmbox] magnatune: disable differently so files are disted

[Jonathan Matthew <jmatthew src gnome org>]

commit 1b5a406704148a0248f4cacafcc65e12ffd661d5
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Dec 22 07:19:48 2011 +1000

    magnatune: disable differently so files are disted
    
    it still doesn't get installed, and the .plugin file doesn't get
    generated so it won't interfere with uninstalled builds.

 plugins/Makefile.am           |    2 +-
 plugins/magnatune/Makefile.am |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2a3ed5c..a035a5d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -18,6 +18,7 @@ SUBDIRS +=						\
 	context						\
 	im-status					\
 	lyrics						\
+	magnatune					\
 	pythonconsole					\
 	rbzeitgeist					\
 	replaygain					\
@@ -25,7 +26,6 @@ SUBDIRS +=						\
 	sendto						\
 	rb
 
-# magnatune
 endif
 
 if ENABLE_VALA
diff --git a/plugins/magnatune/Makefile.am b/plugins/magnatune/Makefile.am
index 1fa6861..fdb3898 100644
--- a/plugins/magnatune/Makefile.am
+++ b/plugins/magnatune/Makefile.am
@@ -1,20 +1,22 @@
 # Magnatune Store Python Plugin
 
+# this plugin is disabled until we can access gnome-keyring
+
 plugindir = $(PLUGINDIR)/magnatune
 plugindatadir = $(PLUGINDATADIR)/magnatune
-plugin_PYTHON =                       \
+noinst_PYTHON =                       \
        MagnatuneSource.py             \
        BuyAlbumHandler.py             \
        TrackListHandler.py            \
        magnatune.py
 
-%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+# %.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+# plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 plugin_in_files = magnatune.plugin.in
 
 gtkbuilderdir = $(plugindatadir)
-gtkbuilder_DATA =	\
+noinst_DATA =	\
 		magnatune-loading.ui			\
 		magnatune-prefs.ui			\
 		magnatune_logo_color_small.png		\
@@ -24,7 +26,7 @@ themedir = $(pkgdatadir)/icons/hicolor
 size = 24x24
 context = places
 icondir = $(themedir)/$(size)/$(context)
-icon_DATA = icons/hicolor/$(size)/$(context)/magnatune.png
+noinst_DATA = icons/hicolor/$(size)/$(context)/magnatune.png
 
 EXTRA_DIST = $(plugin_in_files) $(gtkbuilder_DATA) $(icon_DATA)
 CLEANFILES = $(plugin_DATA)