banshee r3614 - in trunk/banshee: . build src/Extensions src/Extensions/Banshee.Daap src/Extensions/Banshee.Daap/Daap src/Extensions/Banshee.Daap/daap-sharp

[abock svn gnome org]

Author: abock
Date: Mon Mar 31 18:14:54 2008
New Revision: 3614
URL: http://svn.gnome.org/viewvc/banshee?rev=3614&view=rev

Log:
2008-03-31  Aaron Bockover  <abock gnome org>

    * build/build.environment.mk:
    * src/Extensions/Banshee.Daap/Makefile.am:
    * src/Extensions/Extensions.mds:
    * src/Extensions/Makefile.am: Enable the DAAP extension in the build



Added:
   trunk/banshee/src/Extensions/Banshee.Daap/Daap/
      - copied from r3613, /trunk/banshee/src/Extensions/Banshee.Daap/daap-sharp/
Removed:
   trunk/banshee/src/Extensions/Banshee.Daap/daap-sharp/
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.environment.mk
   trunk/banshee/src/Extensions/Banshee.Daap/Makefile.am
   trunk/banshee/src/Extensions/Extensions.mds
   trunk/banshee/src/Extensions/Makefile.am

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Mon Mar 31 18:14:54 2008
@@ -14,6 +14,7 @@
 LINK_CAIRO = -r:Mono.Cairo
 LINK_MONO_POSIX = -r:Mono.Posix
 LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
+LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
 LINK_GLIB = $(GLIBSHARP_LIBS)
 LINK_GTK = $(GTKSHARP_LIBS)
 LINK_GCONF = $(GCONFSHARP_LIBS)
@@ -127,6 +128,7 @@
 # Extensions
 REF_EXTENSION_AUDIOCD = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_MUSICBRAINZ_DEPS)
 REF_EXTENSION_BOOKMARKS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_DAAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_ICSHARP_ZIP_LIB) $(LINK_MONO_ZEROCONF)
 REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)

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	Mon Mar 31 18:14:54 2008
@@ -1,14 +1,16 @@
 ASSEMBLY = Banshee.Daap
 TARGET = library
-LINK = $(REF_EXTENSION_PLAYQUEUE) $(LINK_ICSHARP_ZIP_LIB) $(LINK_SYSTEM_WEB) $(MONO_ZEROCONF_LIBS)
+LINK = $(REF_EXTENSION_DAAP)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = Banshee.Daap/DaapService.cs \
+SOURCES = \
+	Banshee.Daap/DaapService.cs \
     Banshee.Daap/DaapContainerSource.cs \
     Banshee.Daap/DaapSource.cs \
-    daap-sharp/*.cs
+    Daap/*.cs
 
-RESOURCES = daap-sharp/content-codes \
+RESOURCES = \
+	Daap/content-codes \
     Resources/Banshee.Daap.addin.xml
 
 include $(top_srcdir)/build/build.mk

Modified: trunk/banshee/src/Extensions/Extensions.mds
==============================================================================
--- trunk/banshee/src/Extensions/Extensions.mds	(original)
+++ trunk/banshee/src/Extensions/Extensions.mds	Mon Mar 31 18:14:54 2008
@@ -10,15 +10,8 @@
       <Entry build="True" name="Banshee.AudioCd" configuration="Debug" />
     </Configuration>
   </Configurations>
-  <StartMode startupentry="Banshee.NotificationArea" single="True">
-    <Execute type="None" entry="Banshee.NotificationArea" />
-    <Execute type="None" entry="Banshee.DapCore" />
-    <Execute type="None" entry="Banshee.Dap.MassStorage" />
-    <Execute type="None" entry="Banshee.NowPlaying" />
-    <Execute type="None" entry="Banshee.Bookmarks" />
-    <Execute type="None" entry="Banshee.AudioCd" />
-  </StartMode>
   <Entries>
+    <Entry filename="Banshee.NotificationArea/Banshee.Daap.mdp" />
     <Entry filename="Banshee.NotificationArea/Banshee.NotificationArea.mdp" />
     <Entry filename="Banshee.MultimediaKeys/Banshee.MultimediaKeys.mdp" />
     <Entry filename="Banshee.PlayQueue/Banshee.PlayQueue.mdp" />
@@ -27,4 +20,4 @@
     <Entry filename="Banshee.Bookmarks/Banshee.Bookmarks.mdp" />
     <Entry filename="Banshee.AudioCd/Banshee.AudioCd.mdp" />
   </Entries>
-</Combine>
\ No newline at end of file
+</Combine>

Modified: trunk/banshee/src/Extensions/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Makefile.am	Mon Mar 31 18:14:54 2008
@@ -1,6 +1,7 @@
 SUBDIRS = \
 	Banshee.AudioCd \
 	Banshee.Bookmarks \
+	Banshee.Daap \
 	Banshee.Lastfm \
 	Banshee.MultimediaKeys \
 	Banshee.NotificationArea \