From 996f03d96f8b451101a62565b8da1a2140d084d1 Mon Sep 17 00:00:00 2001
From: Gabriel Burt <gabriel.burt@gmail.com>
Date: Tue, 26 Apr 2011 20:53:37 -0500
Subject: cleanup: Remove Ipod backend

The ipod-sharp based backend is obsolete in favor of the AppleDevice,
libgpod-based backend.
---
 build/build.environment.mk   |  2 --
 build/build.rules.mk         |  6 +-----
 build/m4/banshee/dap-ipod.m4 | 34 ----------------------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 build/m4/banshee/dap-ipod.m4

(limited to 'build')

diff --git a/build/build.environment.mk b/build/build.environment.mk
index f8a1d4edb..daf871730 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -22,7 +22,6 @@ LINK_GUDEV = $(GUDEV_SHARP_LIBS)
 LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
 LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS) 
 LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
-LINK_IPOD = $(IPODSHARP_LIBS)
 LINK_BOO = $(BOO_LIBS)
 LINK_GDATA = $(GDATASHARP_LIBS)
 LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@@ -120,7 +119,6 @@ LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
 REF_DAP_APPLEDEVICE = $(LINK_DAP_DEPS) $(LINK_APPLEDEVICE_DEPS)
 REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS)
 REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS)
-REF_DAP_IPOD = $(LINK_DAP_DEPS) $(LINK_IPOD)
 REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
 
 # Extensions
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 78f25fed1..f946a7b0c 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -30,10 +30,6 @@ if ENABLE_ATK
     ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
 endif
 
-if ENABLE_IPOD
-    LEGACY_IPOD_FLAG = "-define:LEGACY_IPOD_SUPPORT"
-endif
-
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
 DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
@@ -73,7 +69,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 		-nowarn:0278 -nowarn:0078 $$warn \
 		-define:HAVE_GTK_2_10 -define:NET_2_0 \
 		-debug -target:$(TARGET) -out:$@ \
-		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) $(ENABLE_ATK_FLAG) $(LEGACY_IPOD_FLAG) \
+		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) $(ENABLE_ATK_FLAG) \
 		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 	@if [ -e $(srcdir)/$(notdir $@.config) ]; then \
 		cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \
diff --git a/build/m4/banshee/dap-ipod.m4 b/build/m4/banshee/dap-ipod.m4
deleted file mode 100644
index 087389115..000000000
--- a/build/m4/banshee/dap-ipod.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-AC_DEFUN([BANSHEE_CHECK_DAP_IPOD],
-[
-	IPODSHARP_REQUIRED=0.8.5
-
-	AC_ARG_ENABLE(ipod, AC_HELP_STRING([--enable-ipod], [Enable legacy ipod-sharp DAP support]), , enable_ipod="no")
-
-	if test "x$enable_ipod" = "xyes"; then
-		enable_ipodsharp="${enable_ipod}"
-		PKG_CHECK_MODULES(IPODSHARP,
-			ipod-sharp >= $IPODSHARP_REQUIRED \
-			ipod-sharp-ui >= $IPODSHARP_REQUIRED,
-			enable_ipodsharp="$enable_ipodsharp", enable_ipodsharp=no)
-
-		if test "x$enable_ipod" = "xyes" -a "x$enable_ipodsharp" = "xno"; then
-			AC_MSG_ERROR([ipod-sharp was not found or is not up to date. Please install ipod-sharp of at least version $IPODSHARP_REQUIRED, or disable iPod support by passing --disable-ipod])
-		fi
-
-		if test "x$enable_ipodsharp" = "xyes"; then
-			asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`"
-			for asm in $asms; do
-				IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm"
-				[[ -r "$asm.mdb" ]] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb"
-			done
-			AC_SUBST(IPODSHARP_ASSEMBLIES)
-			AC_SUBST(IPODSHARP_LIBS)
-		fi
-
-		AM_CONDITIONAL(ENABLE_IPOD, test "x$enable_ipodsharp" = "xyes")
-	else
-		enable_ipodsharp=no
-		AM_CONDITIONAL(ENABLE_IPOD, false)
-	fi
-])
-
-- 
cgit v1.2.3