Now that libmpcdec sources are in contrib/ subdirectory, move xine_musepack_decoder.c in libxineadec.

--HG--
rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c

5 files changed, 23 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index 04e811bc0..9c4d5c2e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2588,7 +2588,6 @@ src/libfaad/codebook/Makefile
 src/libffmpeg/Makefile
 src/libmad/Makefile
 src/libmpeg2/Makefile
-src/libmusepack/Makefile
 src/libspudec/Makefile
 src/libspucc/Makefile
 src/libspucmml/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6718b4805..65c55c963 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,5 @@ SUBDIRS = \
 	libxineadec \
 	libreal \
 	libfaad \
-        libmusepack \
 	post \
 	combined
diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am
deleted file mode 100644
index 59e01ab7f..000000000
--- a/src/libmusepack/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-if MUSEPACK
-xineplug_LTLIBRARIES = xineplug_decode_mpc.la
-endif
-
-if !EXTERNAL_MPCDEC
-link_libmpcdec = $(top_builddir)/contrib/libmpcdec/libmpcdec.la
-cflags_libmpcdec = -I$(top_srcdir)/contrib/libmpcdec
-else
-link_libmpcdec = $(MPCDEC_LIBS)
-cflags_libmpcdec = $(MPCDEC_CFLAGS)
-endif
-
-$(top_builddir)/contrib/libmpcdec/libmpcdec.la:
-	$(MAKE) -C $(top_builddir)/contrib/libmpcdec
-
-xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c
-xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) $(cflags_libmpcdec)
-xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(link_libmpcdec)
-xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags)
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index b2ffcf078..8ed5a8860 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -14,12 +14,29 @@ if HAVE_SPEEX
 speex_module = xineplug_decode_speex.la
 endif
 
+if MUSEPACK
+musepack_module = xineplug_decode_mpc.la
+endif
+
+if !EXTERNAL_MPCDEC
+link_libmpcdec = $(top_builddir)/contrib/libmpcdec/libmpcdec.la
+cflags_libmpcdec = -I$(top_srcdir)/contrib/libmpcdec
+
+$(top_builddir)/contrib/libmpcdec/libmpcdec.la:
+	$(MAKE) -C $(top_builddir)/contrib/libmpcdec
+
+else
+link_libmpcdec = $(MPCDEC_LIBS)
+cflags_libmpcdec = $(MPCDEC_CFLAGS)
+endif
+
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_nsf.la \
 	xineplug_decode_lpcm.la \
 	$(vorbis_module) \
-	$(speex_module)
+	$(speex_module) \
+	$(musepack_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG)
@@ -40,3 +57,8 @@ xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS)
 xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c
 xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)
 xineplug_decode_speex_la_CFLAGS = $(VISIBILITY_FLAGS) $(SPEEX_CFLAGS)
+
+xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c
+xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) $(cflags_libmpcdec)
+xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(link_libmpcdec)
+xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags)
diff --git a/src/libmusepack/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c
index 4397f65e3..4397f65e3 100644
--- a/src/libmusepack/xine_musepack_decoder.c
+++ b/src/libxineadec/xine_musepack_decoder.c