cowbell r28 - in trunk: . base gui taglib-sharp

[btaylor svn gnome org]

Author: btaylor
Date: Sun Apr 13 19:36:38 2008
New Revision: 28
URL: http://svn.gnome.org/viewvc/cowbell?rev=28&view=rev

Log:
2008-04-13  Brad Taylor  <brad getcoded net>
	
	* taglib-sharp/*:  Remove the taglib-sharp bundle as it seems to be
	  more widely distributed now.

	* Makefile.am:
	* configure.ac:
	* base/Makefile.am:
	* gui/Makefile.am:  Require taglib-sharp 2.0.



Removed:
   trunk/taglib-sharp/COPYING
   trunk/taglib-sharp/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/README
   trunk/base/Makefile.am
   trunk/configure.ac
   trunk/gui/AboutDialog.cs
   trunk/gui/Makefile.am
   trunk/taglib-sharp/   (props changed)

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Apr 13 19:36:38 2008
@@ -1,5 +1,4 @@
 SUBDIRS = \
-taglib-sharp \
 base \
 resources \
 gui \

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sun Apr 13 19:36:38 2008
@@ -24,6 +24,7 @@
 Cowbell requires the following to build/run:
   * Gtk# >= 1.9
   * Mono runtime
+  * taglib-sharp
 
 If you have all these things, you're almost done.  Now, all thats left is to
 type:

Modified: trunk/base/Makefile.am
==============================================================================
--- trunk/base/Makefile.am	(original)
+++ trunk/base/Makefile.am	Sun Apr 13 19:36:38 2008
@@ -2,7 +2,7 @@
 
 REFERENCES = \
 -r:System.Web.Services \
--r:$(top_builddir)/taglib-sharp/TagLib.dll
+$(TAGLIBSHARP_LIBS)
 
 FILES = \
 AmazonMetadataProxy.cs \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Apr 13 19:36:38 2008
@@ -47,8 +47,14 @@
 
 AC_SUBST(GTKSHARP_LIBS)
 
+dnl check for taglib-sharp
+TAGLIBSHARP_REQUIRED=2.0
+PKG_CHECK_MODULES(TAGLIBSHARP,
+		taglib-sharp >= $TAGLIBSHARP_REQUIRED)
+
+AC_SUBST(TAGLIBSHARP_LIBS)
+
 AC_OUTPUT([
-taglib-sharp/Makefile
 resources/Makefile
 base/Globals.cs
 base/Makefile

Modified: trunk/gui/AboutDialog.cs
==============================================================================
--- trunk/gui/AboutDialog.cs	(original)
+++ trunk/gui/AboutDialog.cs	Sun Apr 13 19:36:38 2008
@@ -33,7 +33,7 @@
 		{
 			SetUrlHook (new AboutDialogActivateLinkFunc (UrlFunc));
 
-			Name = Globals.AppName;
+			ProgramName = Globals.AppName;
 			Version = Globals.AppVersion;
 			Comments = Catalog.GetString ("An elegant music organizer.");
 			Authors = new string[] {"Brad Taylor <brad getcoded net>"};

Modified: trunk/gui/Makefile.am
==============================================================================
--- trunk/gui/Makefile.am	(original)
+++ trunk/gui/Makefile.am	Sun Apr 13 19:36:38 2008
@@ -16,7 +16,7 @@
 $(GTKSHARP_LIBS) \
 -r:System.Web.Services \
 -r:$(top_builddir)/base/Cowbell.Base.dll \
--r:$(top_builddir)/taglib-sharp/TagLib.dll
+$(TAGLIBSHARP_LIBS)
 
 FILES = \
 AboutDialog.cs \