banshee r3738 - in trunk/banshee: . build build/m4/banshee build/m4/shamrock libbanshee src/Core/Banshee.Services src/Dap/Banshee.Dap.Mtp src/Extensions/Banshee.Daap src/Extensions/Banshee.Lastfm src/Extensions/Banshee.Podcasting src/Libraries/Mtp

From: abock svn gnome org
To: svn-commits-list gnome org
Subject: banshee r3738 - in trunk/banshee: . build build/m4/banshee build/m4/shamrock libbanshee src/Core/Banshee.Services src/Dap/Banshee.Dap.Mtp src/Extensions/Banshee.Daap src/Extensions/Banshee.Lastfm src/Extensions/Banshee.Podcasting src/Libraries/Mtp
Date: Wed, 9 Apr 2008 23:21:39 +0100 (BST)
Author: abock
Date: Wed Apr  9 23:21:39 2008
New Revision: 3738
URL: http://svn.gnome.org/viewvc/banshee?rev=3738&view=rev

Log:
2008-04-09  Aaron Bockover  <abock gnome org>

    * build/build.rules.mk:
    * build/m4/banshee/daap.m4:
    * build/m4/banshee/libbanshee.m4:
    * build/m4/banshee/mono-zeroconf.m4:
    * build/m4/shamrock/gstreamer.m4:
    * configure.ac: Lots of build fixes, disable DAAP and Podcasting by default;
    only link against core gstreamer libraries and gdk-x11

    * libbanshee/banshee-transcoder.c: Remove all GnomeVFS code



Added:
   trunk/banshee/build/m4/banshee/daap.m4
      - copied, changed from r3733, /trunk/banshee/build/m4/banshee/mono-zeroconf.m4
   trunk/banshee/libbanshee/banshee-transcoder.c
      - copied, changed from r3733, /trunk/banshee/libbanshee/gst-transcode-0.10.c
Removed:
   trunk/banshee/build/m4/banshee/mono-zeroconf.m4
   trunk/banshee/build/m4/shamrock/gstreamer.m4
   trunk/banshee/libbanshee/gst-transcode-0.10.c
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.dll.config.in
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.rules.mk
   trunk/banshee/build/m4/banshee/libbanshee.m4
   trunk/banshee/configure.ac
   trunk/banshee/libbanshee/Makefile.am
   trunk/banshee/libbanshee/banshee-player-private.h
   trunk/banshee/libbanshee/libbanshee.mdp
   trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
   trunk/banshee/src/Core/Banshee.Services/Makefile.am
   trunk/banshee/src/Dap/Banshee.Dap.Mtp/Makefile.am
   trunk/banshee/src/Extensions/Banshee.Daap/Makefile.am
   trunk/banshee/src/Extensions/Banshee.Podcasting/Makefile.am
   trunk/banshee/src/Libraries/Mtp/Makefile.am
   trunk/banshee/src/Libraries/Mtp/Mtp.mdp

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Wed Apr  9 23:21:39 2008
@@ -12,9 +12,6 @@
 THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png)
 THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
 
-CONFIG_FILES_IN = $(wildcard $(srcdir)/*.config.in)
-CONFIG_FILES_IN_CLEAN = $(CONFIG_FILES_IN:.config.in=.config)
-
 ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
 ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
 
@@ -66,6 +63,6 @@
 EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) $(CONFIG_FILES_IN)
 
 CLEANFILES = $(OUTPUT_FILES)
-DISTCLEANFILES = *.pidb $(CONFIG_FILES_IN_CLEAN)
+DISTCLEANFILES = *.pidb
 MAINTAINERCLEANFILES = Makefile.in
 

Copied: trunk/banshee/build/m4/banshee/daap.m4 (from r3733, /trunk/banshee/build/m4/banshee/mono-zeroconf.m4)
==============================================================================
--- /trunk/banshee/build/m4/banshee/mono-zeroconf.m4	(original)
+++ trunk/banshee/build/m4/banshee/daap.m4	Wed Apr  9 23:21:39 2008
@@ -1,4 +1,4 @@
-AC_DEFUN([BANSHEE_CHECK_MONO_ZEROCONF],
+AC_DEFUN([BANSHEE_CHECK_DAAP],
 [
 	AC_ARG_ENABLE([daap], AC_HELP_STRING([--disable-daap], 
 		[Do not build with DAAP support]),
@@ -8,7 +8,7 @@
 			elif test "x$enableval" = "xyes"; then
 				enable_daap=yes
 			fi
-		], enable_daap=yes
+		], enable_daap=no
 	)
 
 	if test "x$enable_daap" = "xyes"; then

Modified: trunk/banshee/build/m4/banshee/libbanshee.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/libbanshee.m4	(original)
+++ trunk/banshee/build/m4/banshee/libbanshee.m4	Wed Apr  9 23:21:39 2008
@@ -10,21 +10,9 @@
 	LIBBANSHEE_LIBS=""
 	LIBBANSHEE_CFLAGS=""
 
-	PKG_CHECK_MODULES(GLIB, glib-2.0)
-	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GLIB)
-
-	dnl PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
-	dnl SHAMROCK_CONCAT_MODULE(LIBBANSHEE, DBUS)
-	
-	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8)
-	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GTK)	
+	PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.8)
+	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_X11)	
 	
-	PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0)
-	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GNOMEVFS)
-	
-	dnl PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.1.1)
-	dnl SHAMROCK_CONCAT_MODULE(LIBBANSHEE, MUSICBRAINZ)
-
 	AC_SUBST(LIBBANSHEE_CFLAGS)
 	AC_SUBST(LIBBANSHEE_LIBS)
 ])

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Wed Apr  9 23:21:39 2008
@@ -10,7 +10,7 @@
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE
 
-DISTCHECK_CONFIGURE_FLAGS="--disable-docs"
+DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 ASM_VERSION="$VERSION.*"
@@ -32,14 +32,6 @@
 BANSHEE_CHECK_LIBBANSHEE
 #BANSHEE_CHECK_NAUTILUS_BURN
 BANSHEE_CHECK_GSTREAMER
-SHAMROCK_CHECK_GSTREAMER_0_10_PLUGINS([
-	decodebin
-	playbin
-	gnomevfssink
-	gnomevfssrc
-	audioconvert
-	gconfaudiosink
-])
 
 dnl Mono and gmcs
 SHAMROCK_CHECK_MONO_MODULE_NOBAIL(1.2.4)
@@ -74,15 +66,9 @@
 dnl NUnit (optional)
 SHAMROCK_CHECK_MONO_NUNIT
 
-dnl Boo libraries and compiler (optional)
-#BANSHEE_CHECK_BOO
-
 dnl External TagLib# libraries (optional)
 BANSHEE_CHECK_TAGLIB_SHARP
 
-dnl External Mono.Zeroconf
-BANSHEE_CHECK_MONO_ZEROCONF
-
 dnl Required dependencies (managed/core)
 BANSHEE_CHECK_GTK_SHARP
 BANSHEE_CHECK_GNOME_SHARP
@@ -94,17 +80,21 @@
 AM_GCONF_SOURCE_2
 
 dnl DAP support (each module is optional)
+BANSHEE_CHECK_DAP_MTP
 #BANSHEE_CHECK_DAP_IPOD
 #BANSHEE_CHECK_DAP_NJB
-BANSHEE_CHECK_DAP_MTP
 #BANSHEE_CHECK_DAP_KARMA
 
 dnl DAAP support (optional)
-#BANSHEE_CHECK_DAAP
+BANSHEE_CHECK_DAAP
 
 dnl i18n
 SHAMROCK_CONFIGURE_I18N($PACKAGE)
 
+AC_ARG_ENABLE(podcast, AC_HELP_STRING([--enable-podcast], 
+	[Enable Podcast extension]), , enable_podcast="no")
+AM_CONDITIONAL(ENABLE_PODCAST, test "x$enable_podcast" = "xyes")
+
 dnl generated files
 AC_OUTPUT([
 Makefile
@@ -178,13 +168,6 @@
 src/Extensions/Banshee.Sample/Makefile
 ])
 
-if test "x${enable_daap}" = "xyes"; then
-	zeroconf_lib=", Avahi"
-	if test "x${enable_mdnsd}" = "xyes"; then
-		zeroconf_lib=", mDNSResponder"
-	fi
-fi
-
 echo "
 ${PACKAGE}-${VERSION}
 
@@ -199,20 +182,12 @@
     Gtk# >= 2.10:      ${HAVE_GTK_2_10}
 
     Digital Audio Player (DAP) Support:
-      Mass Storage:    yes (unstable)
-      MTP:             ${enable_mtp_dap} (unstable)
+      Mass Storage:    yes	(unstable)
+      MTP:             ${enable_mtp_dap}	(unstable)
 
-    DAAP Support:      ${enable_daap} (unstable)
+    DAAP Support:      ${enable_daap}	(unstable)
+    Podcast Support:   ${enable_podcast}	(unstable)
 "
-#    Digital Audio Players (DAP):
-#      iPod:            ${enable_ipodsharp}
-#      NJB:             ${enable_njbsharp}
-#      MTP:             ${enable_mtp_dap}
-#      Karma:           ${enable_karmasharp}
-#
-#    DAAP Support:      ${enable_daap}${zeroconf_lib}
-#"
-
 if test -d ${expanded_libdir}/${PACKAGE}; then
 	echo "WARNING: An existing Banshee install is in ${expanded_libdir}/${PACKAGE}"
 	echo "         Remove the existing install before installing this build."

Modified: trunk/banshee/libbanshee/Makefile.am
==============================================================================
--- trunk/banshee/libbanshee/Makefile.am	(original)
+++ trunk/banshee/libbanshee/Makefile.am	Wed Apr  9 23:21:39 2008
@@ -3,10 +3,8 @@
 	-Wall \
 	-ggdb3 \
 	-D_FORTIFY_SOURCE=2 \
-	-DINSIDE_LIBBANSHEE_I_SWEAR \
 	$(LIBBANSHEE_CFLAGS) \
-	$(GST_CFLAGS) \
-	$(LIBNAUTILUS_BURN_CFLAGS)
+	$(GST_CFLAGS) 
 
 bansheelibdir = $(pkglibdir)
 bansheelib_LTLIBRARIES = libbanshee.la
@@ -22,7 +20,7 @@
 	banshee-player-video.c \
 	banshee-ripper.c \
 	banshee-tagger.c \
-	gst-transcode-0.10.c
+	banshee-transcoder.c
 
 noinst_HEADERS =  \
 	banshee-gst.h \

Modified: trunk/banshee/libbanshee/banshee-player-private.h
==============================================================================
--- trunk/banshee/libbanshee/banshee-player-private.h	(original)
+++ trunk/banshee/libbanshee/banshee-player-private.h	Wed Apr  9 23:21:39 2008
@@ -29,10 +29,6 @@
 #ifndef _BANSHEE_PLAYER_PRIVATE_H
 #define _BANSHEE_PLAYER_PRIVATE_H
 
-#ifndef INSIDE_LIBBANSHEE_I_SWEAR
-#error libbanshee is not a stable API and is not meant to be used by third party applications
-#endif
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif

Copied: trunk/banshee/libbanshee/banshee-transcoder.c (from r3733, /trunk/banshee/libbanshee/gst-transcode-0.10.c)
==============================================================================
--- /trunk/banshee/libbanshee/gst-transcode-0.10.c	(original)
+++ trunk/banshee/libbanshee/banshee-transcoder.c	Wed Apr  9 23:21:39 2008
@@ -1,31 +1,31 @@
-/***************************************************************************
- *  gst-transcode-0.10.c
- *
- *  Copyright (C) 2005-2006 Novell, Inc.
- *  Written by Aaron Bockover <aaron abock org>
- ****************************************************************************/
-
-/*  THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW: 
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),  
- *  to deal in the Software without restriction, including without limitation  
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,  
- *  and/or sell copies of the Software, and to permit persons to whom the  
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in 
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
- *  DEALINGS IN THE SOFTWARE.
- */
- 
+//
+// banshee-transcoder.c
+//
+// Author:
+//   Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2005-2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 #include <gst/gst.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -34,8 +34,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <libgnomevfs/gnome-vfs.h>
-
 typedef struct GstTranscoder GstTranscoder;
 
 typedef void (* GstTranscoderProgressCallback) (GstTranscoder *transcoder, gdouble progress);
@@ -66,13 +64,6 @@
 }
 
 static gboolean
-gst_transcoder_gvfs_allow_overwrite_cb(GstElement *element, gpointer filename,
-    gpointer user_data)
-{
-    return TRUE;
-}
-
-static gboolean
 gst_transcoder_iterate_timeout(GstTranscoder *transcoder)
 {
     GstFormat format = GST_FORMAT_TIME;
@@ -122,7 +113,6 @@
 static gboolean
 gst_transcoder_bus_callback(GstBus *bus, GstMessage *message, gpointer data)
 {
-    GnomeVFSFileInfo fileinfo;
     GstTranscoder *transcoder = (GstTranscoder *)data;
 
     g_return_val_if_fail(transcoder != NULL, FALSE);
@@ -151,6 +141,9 @@
             transcoder->is_transcoding = FALSE;
             gst_transcoder_stop_iterate_timeout(transcoder);
 
+            /*
+             FIXME: Replace with regular stat
+             GnomeVFSFileInfo fileinfo;
             if(gnome_vfs_get_file_info(transcoder->output_uri, &fileinfo, 
                 GNOME_VFS_FILE_INFO_DEFAULT) == GNOME_VFS_OK) {
                 if(fileinfo.size < 100) {
@@ -162,7 +155,7 @@
             } else {
                 gst_transcoder_raise_error(transcoder, _("Could not stat encoded file"), NULL);
                 break;
-            }
+            }*/
             
             if(transcoder->finished_cb != NULL) {
                 transcoder->finished_cb(transcoder);
@@ -242,9 +235,9 @@
     
     transcoder->pipeline = gst_pipeline_new("pipeline");
 
-    source_elem = gst_element_factory_make("gnomevfssrc", "source");
+    source_elem = gst_element_factory_make("filesrc", "source");
     if(source_elem == NULL) {
-        gst_transcoder_raise_error(transcoder, _("Could not create 'gnomevfssrc' plugin"), NULL);
+        gst_transcoder_raise_error(transcoder, _("Could not create 'filesrc' plugin"), NULL);
         return FALSE;
     }
 
@@ -254,9 +247,9 @@
         return FALSE;
     }
     
-    sink_elem = gst_element_factory_make("gnomevfssink", "sink");
+    sink_elem = gst_element_factory_make("filesink", "sink");
     if(sink_elem == NULL) {
-        gst_transcoder_raise_error(transcoder, _("Could not create 'gnomevfssink' plugin"), NULL);
+        gst_transcoder_raise_error(transcoder, _("Could not create 'filesink' plugin"), NULL);
         return FALSE;
     }
     
@@ -290,9 +283,6 @@
     gst_element_add_pad(transcoder->sink_bin, gst_ghost_pad_new("sink", encoder_pad));
     gst_object_unref(encoder_pad);
     
-    g_signal_connect(G_OBJECT(sink_elem), "allow-overwrite",
-        G_CALLBACK(gst_transcoder_gvfs_allow_overwrite_cb), transcoder);
-    
     gst_bin_add_many(GST_BIN(transcoder->pipeline), source_elem, decoder_elem, 
         transcoder->sink_bin, NULL);
         

Modified: trunk/banshee/libbanshee/libbanshee.mdp
==============================================================================
--- trunk/banshee/libbanshee/libbanshee.mdp	(original)
+++ trunk/banshee/libbanshee/libbanshee.mdp	Wed Apr  9 23:21:39 2008
@@ -11,7 +11,7 @@
     <File name="banshee-ripper.c" subtype="Code" buildaction="Compile" />
     <File name="banshee-gst.c" subtype="Code" buildaction="Compile" />
     <File name="banshee-player.c" subtype="Code" buildaction="Compile" />
-    <File name="gst-transcode-0.10.c" subtype="Code" buildaction="Compile" />
+    <File name="banshee-transcoder.c" subtype="Code" buildaction="Compile" />
     <File name="banshee-player-private.h" subtype="Code" buildaction="Nothing" />
     <File name="banshee-player-cdda.h" subtype="Code" buildaction="Nothing" />
     <File name="banshee-player-cdda.c" subtype="Code" buildaction="Compile" />

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp	Wed Apr  9 23:21:39 2008
@@ -144,6 +144,7 @@
     <File name="Banshee.MediaProfiles/PipelineVariable.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.MediaProfiles/Profile.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.MediaProfiles/ProfileConfiguration.cs" subtype="Code" buildaction="Compile" />
+    <File name="Banshee.Hardware/IDeviceMediaCapabilities.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -168,4 +169,4 @@
     <AsmRefVar />
     <ProjectRefVar />
   </MonoDevelop.Autotools.MakefileInfo>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am	Wed Apr  9 23:21:39 2008
@@ -5,10 +5,10 @@
 SOURCES =  \
 	Banshee.Base/RateLimiter.cs \
 	Banshee.Base/ThreadAssist.cs \
-	Banshee.Collection.Database/DatabaseAlbumListModel.cs \
-	Banshee.Collection.Database/DatabaseArtistListModel.cs \
 	Banshee.Collection.Database/DatabaseAlbumInfo.cs \
+	Banshee.Collection.Database/DatabaseAlbumListModel.cs \
 	Banshee.Collection.Database/DatabaseArtistInfo.cs \
+	Banshee.Collection.Database/DatabaseArtistListModel.cs \
 	Banshee.Collection.Database/DatabaseImportManager.cs \
 	Banshee.Collection.Database/DatabaseTrackInfo.cs \
 	Banshee.Collection.Database/DatabaseTrackListModel.cs \
@@ -36,10 +36,10 @@
 	Banshee.Hardware/IBlockDevice.cs \
 	Banshee.Hardware/ICdromDevice.cs \
 	Banshee.Hardware/IDevice.cs \
+	Banshee.Hardware/IDeviceMediaCapabilities.cs \
 	Banshee.Hardware/IDiscVolume.cs \
 	Banshee.Hardware/IDiskDevice.cs \
 	Banshee.Hardware/IHardwareManager.cs \
-	Banshee.Hardware/IDeviceMediaCapabilities.cs \
 	Banshee.Hardware/IVolume.cs \
 	Banshee.Library/HomeDirectoryImportSource.cs \
 	Banshee.Library/IImportSource.cs \

Modified: trunk/banshee/src/Dap/Banshee.Dap.Mtp/Makefile.am
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.Mtp/Makefile.am	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.Mtp/Makefile.am	Wed Apr  9 23:21:39 2008
@@ -1,4 +1,3 @@
-if ENABLE_MTP
 ASSEMBLY = Banshee.Dap.Mtp
 TARGET = library
 LINK = $(REF_DAP_MTP)
@@ -8,5 +7,8 @@
 
 RESOURCES = Banshee.Dap.Mtp.addin.xml
 
+if ENABLE_MTP
 include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
 endif

Modified: trunk/banshee/src/Extensions/Banshee.Daap/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Makefile.am	Wed Apr  9 23:21:39 2008
@@ -1,4 +1,3 @@
-if DAAP_ENABLED
 ASSEMBLY = Banshee.Daap
 TARGET = library
 LINK = $(REF_EXTENSION_DAAP)
@@ -33,6 +32,9 @@
 	Daap/content-codes \
 	Resources/Banshee.Daap.addin.xml
 
+if DAAP_ENABLED
 include $(top_srcdir)/build/build.mk
-
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
 endif
+

Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Makefile.am	Wed Apr  9 23:21:39 2008
@@ -37,5 +37,9 @@
 	Resources/Images/podcast-icon-48.png \
 	Resources/Images/podcast-new-16.png
 
+if ENABLE_PODCAST
 include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif
 

Modified: trunk/banshee/src/Libraries/Mtp/Makefile.am
==============================================================================
--- trunk/banshee/src/Libraries/Mtp/Makefile.am	(original)
+++ trunk/banshee/src/Libraries/Mtp/Makefile.am	Wed Apr  9 23:21:39 2008
@@ -2,19 +2,24 @@
 TARGET = library
 LINK = $(REF_MTP)
 
-SOURCES = \
-	Mtp/FileType.cs \
-	Mtp/ErrorCode.cs \
+SOURCES =  \
+	Mtp/Album.cs \
 	Mtp/Error.cs \
+	Mtp/ErrorCode.cs \
 	Mtp/FileSampleData.cs \
-	Mtp/Album.cs \
+	Mtp/FileType.cs \
 	Mtp/Folder.cs \
 	Mtp/MtpDevice.cs \
 	Mtp/Track.cs
 
 if ENABLE_MTP
 include $(top_srcdir)/build/build.mk
+module_SCRIPTS += Mtp.dll.config
+EXTRA_DIST += Mtp.dll.config.in
+DISTCLEANFILES += Mtp.dll.config
 else
-EXTRA_DIST = $(SOURCES) *.config.in
+EXTRA_DIST = $(SOURCES) Mtp.dll.config.in
+DISTCLEANFILES = Mtp.dll.config
 endif
 
+

Modified: trunk/banshee/src/Libraries/Mtp/Mtp.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Mtp/Mtp.mdp	(original)
+++ trunk/banshee/src/Libraries/Mtp/Mtp.mdp	Wed Apr  9 23:21:39 2008
@@ -8,6 +8,14 @@
     </Configuration>
   </Configurations>
   <Contents>
+    <File name="Mtp/FileType.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/ErrorCode.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/Error.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/FileSampleData.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/Album.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/Folder.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/MtpDevice.cs" subtype="Code" buildaction="Compile" />
+    <File name="Mtp/Track.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -22,4 +30,4 @@
     <AsmRefVar />
     <ProjectRefVar />
   </MonoDevelop.Autotools.MakefileInfo>
-</Project>
+</Project>
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]