5 files changed, 14 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index a0d76ecbc..e2781cd29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,7 +1152,6 @@ src/input/vcd/libcdio/MSWindows/Makefile
 src/input/vcd/libcdio/image/Makefile
 src/input/vcd/libvcd/Makefile
 src/input/vcd/libvcd/libvcd/Makefile
-src/liba52/Makefile
 src/libfaad/Makefile
 src/libfaad/codebook/Makefile
 src/libffmpeg/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 3fa5d7629..c5602f069 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ SUBDIRS = \
 	demuxers \
 	libffmpeg \
 	libmpeg2 \
-	liba52 \
 	libspudec \
 	libspucc \
 	libspucmml \
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
deleted file mode 100644
index 6be417281..000000000
--- a/src/liba52/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/a52dec/liba52.la:
-	$(MAKE) -C $(top_builddir)/contrib/a52dec
-
-if ENABLE_A52DEC
-xineplug_LTLIBRARIES = xineplug_decode_a52.la
-endif
-
-xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(A52DEC_LIBS) -lm
-xineplug_decode_a52_la_CFLAGS = $(AM_CFLAGS) $(A52DEC_CFLAGS)
-xineplug_decode_a52_la_DEPENDENCIES = $(A52DEC_DEPS)
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 5545a44d0..dca31834e 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -25,6 +25,9 @@ if ENABLE_MAD
 mad_module = xineplug_decode_mad.la
 endif
 
+$(top_builddir)/contrib/a52dec/liba52.la:
+	$(MAKE) -C $(top_builddir)/contrib/a52dec
+
 $(top_builddir)/contrib/libmad/libmad.la:
 	$(MAKE) -C $(top_builddir)/contrib/libmad
 
@@ -37,6 +40,10 @@ $(top_builddir)/contrib/libdca/libdca.la:
 $(top_builddir)/contrib/gsm610/libgsm610.la:
 	$(MAKE) -C $(top_builddir)/contrib/gsm610
 
+if ENABLE_A52DEC
+a52_module = xineplug_decode_a52.la
+endif
+
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_lpcm.la \
@@ -44,7 +51,8 @@ xineplug_LTLIBRARIES = \
 	$(speex_module) \
 	$(musepack_module) \
 	$(dts_module) \
-	$(mad_module)
+	$(mad_module) \
+	$(a52_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/gsm610/libgsm610.la
@@ -75,3 +83,8 @@ 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)
+
+xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c
+xineplug_decode_a52_la_DEPENDENCIES = $(A52DEC_DEPS)
+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(A52DEC_LIBS) -lm
+xineplug_decode_a52_la_CFLAGS = $(AM_CFLAGS) $(A52DEC_CFLAGS)
diff --git a/src/liba52/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c
index 5435e9664..5435e9664 100644
--- a/src/liba52/xine_a52_decoder.c
+++ b/src/libxineadec/xine_a52_decoder.c