4 files changed, 14 insertions, 18 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0accfab88..3fa5d7629 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
 	libspucmml \
 	libspudvb \
 	libsputext \
-	libmad \
 	libw32dll \
 	libxinevdec \
 	libxineadec \
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
deleted file mode 100644
index 76d378465..000000000
--- a/src/libmad/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_LDFLAGS  = $(xineplug_ldflags)
-
-$(top_builddir)/contrib/libmad/libmad.la:
-	$(MAKE) -C $(top_builddir)/contrib/libmad
-
-if ENABLE_MAD
-xineplug_LTLIBRARIES = xineplug_decode_mad.la
-endif
-
-xineplug_decode_mad_la_SOURCES = xine_mad_decoder.c
-xineplug_decode_mad_la_DEPENDENCIES = $(LIBMAD_DEPS)
-xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(LIBMAD_LIBS)
-xineplug_decode_mad_la_CFLAGS = $(AM_CFLAGS) $(LIBMAD_CFLAGS)
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 25d1e358a..5545a44d0 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -21,6 +21,13 @@ if ENABLE_DTS
 dts_module = xineplug_decode_dts.la
 endif
 
+if ENABLE_MAD
+mad_module = xineplug_decode_mad.la
+endif
+
+$(top_builddir)/contrib/libmad/libmad.la:
+	$(MAKE) -C $(top_builddir)/contrib/libmad
+
 $(top_builddir)/contrib/libmpcdec/libmpcdec.la:
 	$(MAKE) -C $(top_builddir)/contrib/libmpcdec
 
@@ -36,7 +43,8 @@ xineplug_LTLIBRARIES = \
 	$(vorbis_module) \
 	$(speex_module) \
 	$(musepack_module) \
-	$(dts_module)
+	$(dts_module) \
+	$(mad_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/gsm610/libgsm610.la
@@ -62,3 +70,8 @@ xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c
 xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS)
 xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS)
 xineplug_decode_dts_la_CFLAGS = $(AM_CFLAGS) $(LIBDTS_CFLAGS)
+
+xineplug_decode_mad_la_SOURCES = xine_mad_decoder.c
+xineplug_decode_mad_la_DEPENDENCIES = $(LIBMAD_DEPS)
+xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(LIBMAD_LIBS)
+xineplug_decode_mad_la_CFLAGS = $(AM_CFLAGS) $(LIBMAD_CFLAGS)
diff --git a/src/libmad/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c
index 28407cfec..28407cfec 100644
--- a/src/libmad/xine_mad_decoder.c
+++ b/src/libxineadec/xine_mad_decoder.c