banshee r3044 - in trunk/banshee: . branding build build/m4/banshee docs/Banshee docs/Hyena ext/hal-sharp extras/tools old-code/Dap old-code/Extras old-code/Plugins src/Dap src/Extras src/Plugins

[abock svn gnome org]

Author: abock
Date: Sun Jan 27 05:15:29 2008
New Revision: 3044
URL: http://svn.gnome.org/viewvc/banshee?rev=3044&view=rev

Log:
Tons of build re-adjustments... stand by

Added:
   trunk/banshee/docs/Banshee/
   trunk/banshee/docs/Hyena/
   trunk/banshee/old-code/Dap/
      - copied from r3030, /trunk/banshee/src/Dap/
   trunk/banshee/old-code/Extras/
      - copied from r3030, /trunk/banshee/src/Extras/
   trunk/banshee/old-code/Plugins/
      - copied from r3030, /trunk/banshee/src/Plugins/
Removed:
   trunk/banshee/branding/
   trunk/banshee/build/Common.Makefile
   trunk/banshee/src/Dap/
   trunk/banshee/src/Extras/
   trunk/banshee/src/Plugins/
Modified:
   trunk/banshee/Makefile.am
   trunk/banshee/build/Makefile.am
   trunk/banshee/build/build.environment.mk
   trunk/banshee/build/m4/banshee/taglib.m4
   trunk/banshee/configure.ac
   trunk/banshee/ext/hal-sharp/Makefile.am
   trunk/banshee/extras/tools/Makefile.am

Modified: trunk/banshee/Makefile.am
==============================================================================
--- trunk/banshee/Makefile.am	(original)
+++ trunk/banshee/Makefile.am	Sun Jan 27 05:15:29 2008
@@ -2,12 +2,10 @@
 	build \
 	data \
 	libbanshee \
-	ext \
 	src \
 	docs \
 	tests \
 	extras \
-	branding \
 	po
 
 EXTRA_DIST = \

Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am	(original)
+++ trunk/banshee/build/Makefile.am	Sun Jan 27 05:15:29 2008
@@ -1,5 +1,3 @@
-include $(top_srcdir)/build/Common.Makefile
-
 SUBDIRS = m4
 
 GCONF_SCHEMA_EXTRACTOR_ASSEMBLY = gconf-schema-extractor.exe
@@ -21,7 +19,6 @@
 		$(top_srcdir)/src/Core/Banshee.Core/Resources/translators.xml
 
 EXTRA_DIST = \
-	Common.Makefile \
 	icon-theme-installer \
 	GConfSchemaExtractor.cs \
 	TranslatorExtractor.cs \

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Sun Jan 27 05:15:29 2008
@@ -15,25 +15,15 @@
 LINK_GTK = $(GTKSHARP_LIBS)
 LINK_GCONF = $(GCONFSHARP_LIBS)
 LINK_DBUS = $(NDESK_DBUS_LIBS)
-
-# Internal directories/libraries
-
-# Ext
-DIR_EXT = $(top_srcdir)/ext
-
-#DIR_MONO_ADDINS = $(DIR_EXT)/mono-addins/Mono.Addins
-#MONO_BASE_PATH += $(DIR_MONO_ADDINS)
-#LINK_MONO_ADDINS_DEPS = -r:$(DIR_MONO_ADDINS)/Mono.Addins.dll
 LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
 LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
 LINK_MONO_ADDINS_GUI_DEPS = $(MONO_ADDINS_GUI_LIBS)
+LINK_TAGLIB_DEPS = $(TAGLIB_SHARP_LIBS)
 
-DIR_TAGLIB = $(DIR_EXT)/taglib-sharp
-MONO_BASE_PATH += $(DIR_TAGLIB)
-REF_TAGLIB = $(LINK_MONO_POSIX)
-LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
-LINK_TAGLIB_DEPS = $(REF_TAGLIB) $(LINK_TAGLIB)
+# Internal directories/libraries
 
+# Ext
+DIR_EXT = $(top_srcdir)/ext
 
 # Extras
 DIR_EXTRAS = $(top_srcdir)/src/Extras

Modified: trunk/banshee/build/m4/banshee/taglib.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/taglib.m4	(original)
+++ trunk/banshee/build/m4/banshee/taglib.m4	Sun Jan 27 05:15:29 2008
@@ -1,20 +1,5 @@
 AC_DEFUN([BANSHEE_CHECK_TAGLIB_SHARP],
 [
-	AC_ARG_ENABLE(external_taglib_sharp, AC_HELP_STRING([--enable-external-taglib-sharp], 
-		[Use external TagLib# instead of the bundled one]), 
-		enable_external_taglib_sharp="yes", enable_external_taglib_sharp="no")
-
-	if test "x$enable_external_taglib_sharp" = "xyes"; then
-		PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0.0)
-		AC_SUBST(TAGLIB_SHARP_LIBS)
-		TAGLIB_SHARP_PC_REQUIRES=taglib-sharp
-		AC_SUBST(TAGLIB_SHARP_PC_REQUIRES)
-		AM_CONDITIONAL(EXTERNAL_TAGLIB_SHARP, true)
-	else
-		AC_MSG_RESULT([no])
-		TAGLIB_SHARP_PC_LIBS=-r:${expanded_libdir}/banshee/TagLib.dll
-		AC_SUBST(TAGLIB_SHARP_PC_LIBS)
-		AM_CONDITIONAL(EXTERNAL_TAGLIB_SHARP, false)
-	fi
+	PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0.0)
+	AC_SUBST(TAGLIB_SHARP_LIBS)
 ])
-

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Sun Jan 27 05:15:29 2008
@@ -106,18 +106,21 @@
 data/icon-theme-hicolor/Makefile
 
 docs/Makefile
+docs/Hyena/Makefile
+docs/Banshee/Makefile
+
+po/Makefile.in
+
 tests/Makefile
+
 extras/Makefile
 extras/tools/Makefile
 extras/tools/banshee-import
-branding/Makefile
-po/Makefile.in
 
 libbanshee/Makefile
 
 ext/Makefile
 ext/hal-sharp/Makefile
-ext/taglib-sharp/Makefile
 
 src/Makefile
 src/AssemblyInfo.cs
@@ -133,47 +136,12 @@
 src/Core/Nereid/Makefile
 src/Core/Nereid/banshee2
 
-src/Dap/Makefile
-src/Dap/Banshee.Dap.Ipod/Makefile
-src/Dap/Banshee.Dap.Ipod/ipod-sharp.dll.config
-src/Dap/Banshee.Dap.Karma/Makefile
-src/Dap/Banshee.Dap.MassStorage/Makefile
-src/Dap/Banshee.Dap.Mtp/Makefile
-src/Dap/Banshee.Dap.Njb/Makefile
-src/Dap/Banshee.Dap.Njb/njb-sharp.dll.config
-
 src/Backends/Makefile
 src/Backends/Banshee.GStreamer/Makefile
 
 src/Extensions/Makefile
 src/Extensions/Banshee.MultimediaKeys/Makefile
 src/Extensions/Banshee.NotificationArea/Makefile
-
-src/Extras/Makefile
-src/Extras/Boo/Makefile
-src/Extras/BooBuddy/Makefile
-src/Extras/Gnome.Keyring/Makefile
-src/Extras/Last.FM/Makefile
-src/Extras/MusicBrainz/Makefile
-src/Extras/MusicBrainz/MusicBrainz.dll.config
-
-src/Plugins/Makefile
-src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile
-src/Plugins/Banshee.Plugins.Audioscrobbler/Banshee.Plugins.Audioscrobbler.dll.config
-src/Plugins/Banshee.Plugins.Bookmarks/Makefile
-src/Plugins/Banshee.Plugins.Daap/Makefile
-src/Plugins/Banshee.Plugins.Daap/Banshee.Plugins.Daap.dll.config
-src/Plugins/Banshee.Plugins.MetadataSearch/Makefile
-src/Plugins/Banshee.Plugins.MetadataSearch/Banshee.Plugins.MetadataSearch.dll.config
-src/Plugins/Banshee.Plugins.MiniMode/Makefile
-src/Plugins/Banshee.Plugins.MMKeys/Makefile
-src/Plugins/Banshee.Plugins.MMKeys/Banshee.Plugins.MMKeys.dll.config
-src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile
-src/Plugins/Banshee.Plugins.NotificationAreaIcon/Banshee.Plugins.NotificationAreaIcon.dll.config
-src/Plugins/Banshee.Plugins.Podcast/Makefile
-src/Plugins/Banshee.Plugins.Radio/Makefile
-src/Plugins/Banshee.Plugins.Recommendation/Makefile
-src/Plugins/Banshee.Plugins.Sample/Makefile
 ])
 
 if test "x${enable_daap}" = "xyes"; then

Modified: trunk/banshee/ext/hal-sharp/Makefile.am
==============================================================================
--- trunk/banshee/ext/hal-sharp/Makefile.am	(original)
+++ trunk/banshee/ext/hal-sharp/Makefile.am	Sun Jan 27 05:15:29 2008
@@ -1,5 +1,3 @@
-include $(top_srcdir)/build/Common.Makefile 
-
 ASSEMBLY_NAME = Hal
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 

Modified: trunk/banshee/extras/tools/Makefile.am
==============================================================================
--- trunk/banshee/extras/tools/Makefile.am	(original)
+++ trunk/banshee/extras/tools/Makefile.am	Sun Jan 27 05:15:29 2008
@@ -1,5 +1,3 @@
-include $(top_srcdir)/build/Common.Makefile
-
 BANSHEE_IMPORT = banshee-import
 BANSHEE_IMPORT_ASSEMBLY = $(BANSHEE_IMPORT).exe
 DBUS_CLIENT_ASSEMBLY = dbus-client.exe