Move liba52/a52dec sources inside contrib/a52dec.

--HG--
rename : src/liba52/a52.h => contrib/a52dec/a52.h
rename : src/liba52/a52_internal.h => contrib/a52dec/a52_internal.h
rename : src/liba52/bit_allocate.c => contrib/a52dec/bit_allocate.c
rename : src/liba52/bitstream.c => contrib/a52dec/bitstream.c
rename : src/liba52/bitstream.h => contrib/a52dec/bitstream.h
rename : src/liba52/crc.c => contrib/a52dec/crc.c
rename : src/liba52/diff_against_release.patch => contrib/a52dec/diff_against_release.patch
rename : src/liba52/downmix.c => contrib/a52dec/downmix.c
rename : src/liba52/imdct.c => contrib/a52dec/imdct.c
rename : src/liba52/parse.c => contrib/a52dec/parse.c
rename : src/liba52/tables.h => contrib/a52dec/tables.h

16 files changed, 34 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index c7fd6968b..a0d76ecbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1114,6 +1114,7 @@ doc/hackersguide/Makefile
 doc/faq/Makefile
 doc/Doxyfile
 contrib/Makefile
+contrib/a52dec/Makefile
 contrib/gsm610/Makefile
 contrib/libdca/Makefile
 contrib/libmad/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 6e259a4a3..e0ac4b1b8 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad
+SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec
 
 srcdir = $(shell cd @srcdir@; pwd)
 
diff --git a/contrib/a52dec/Makefile.am b/contrib/a52dec/Makefile.am
new file mode 100644
index 000000000..70b319760
--- /dev/null
+++ b/contrib/a52dec/Makefile.am
@@ -0,0 +1,14 @@
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
+EXTRA_DIST = COPYING
+
+if ENABLE_A52DEC
+if !WITH_EXTERNAL_A52DEC
+noinst_LTLIBRARIES = liba52.la
+endif
+endif
+
+liba52_la_SOURCES = bitstream.c bit_allocate.c downmix.c imdct.c parse.c \
+	a52.h a52_internal.h bitstream.h tables.h crc.c
+liba52_la_LIBADD = -lm
+liba52_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/src/liba52/a52.h b/contrib/a52dec/a52.h
index 9db52ccf8..9db52ccf8 100644
--- a/src/liba52/a52.h
+++ b/contrib/a52dec/a52.h
diff --git a/src/liba52/a52_internal.h b/contrib/a52dec/a52_internal.h
index 541d94803..541d94803 100644
--- a/src/liba52/a52_internal.h
+++ b/contrib/a52dec/a52_internal.h
diff --git a/src/liba52/bit_allocate.c b/contrib/a52dec/bit_allocate.c
index 0567b2285..0567b2285 100644
--- a/src/liba52/bit_allocate.c
+++ b/contrib/a52dec/bit_allocate.c
diff --git a/src/liba52/bitstream.c b/contrib/a52dec/bitstream.c
index 04e8ca6d0..04e8ca6d0 100644
--- a/src/liba52/bitstream.c
+++ b/contrib/a52dec/bitstream.c
diff --git a/src/liba52/bitstream.h b/contrib/a52dec/bitstream.h
index f242c37c4..f242c37c4 100644
--- a/src/liba52/bitstream.h
+++ b/contrib/a52dec/bitstream.h
diff --git a/src/liba52/crc.c b/contrib/a52dec/crc.c
index 38254c9ef..38254c9ef 100644
--- a/src/liba52/crc.c
+++ b/contrib/a52dec/crc.c
diff --git a/src/liba52/diff_against_release.patch b/contrib/a52dec/diff_against_release.patch
index d7f7ff2f2..d7f7ff2f2 100644
--- a/src/liba52/diff_against_release.patch
+++ b/contrib/a52dec/diff_against_release.patch
diff --git a/src/liba52/downmix.c b/contrib/a52dec/downmix.c
index b9ac1fdea..b9ac1fdea 100644
--- a/src/liba52/downmix.c
+++ b/contrib/a52dec/downmix.c
diff --git a/src/liba52/imdct.c b/contrib/a52dec/imdct.c
index 5835e70a1..5835e70a1 100644
--- a/src/liba52/imdct.c
+++ b/contrib/a52dec/imdct.c
diff --git a/src/liba52/parse.c b/contrib/a52dec/parse.c
index 0bfd02fce..0bfd02fce 100644
--- a/src/liba52/parse.c
+++ b/contrib/a52dec/parse.c
diff --git a/src/liba52/tables.h b/contrib/a52dec/tables.h
index a35543db7..a35543db7 100644
--- a/src/liba52/tables.h
+++ b/contrib/a52dec/tables.h
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index 535af20bf..7327ba5db 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -29,6 +29,18 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
         else
             AC_MSG_RESULT([Using included a52dec support])
         fi
+        if test x"$have_external_a52dec" = x"yes"; then
+            A52DEC_CFLAGS=''
+            A52DEC_LIBS='-la52'
+            A52DEC_DEPS=''
+	else
+            A52DEC_CFLAGS='-I$(top_srcdir)/contrib/a52dec'
+            A52DEC_LIBS='$(top_builddir)/contrib/a52dec/liba52.la'
+            A52DEC_DEPS='$(top_builddir)/contrib/a52dec/liba52.la'
+        fi
+        AC_SUBST(A52DEC_CFLAGS)
+        AC_SUBST(A52DEC_DEPS)
+        AC_SUBST(A52DEC_LIBS)
     fi
     AM_CONDITIONAL([ENABLE_A52DEC], [test x"$enable_a52dec" != x"no"])
     AM_CONDITIONAL([WITH_EXTERNAL_A52DEC], [test x"$have_external_a52dec" = x"yes"])
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index 1025b373d..6be417281 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -3,19 +3,14 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-noinst_HEADERS = a52.h a52_internal.h bitstream.h tables.h crc.c
+$(top_builddir)/contrib/a52dec/liba52.la:
+	$(MAKE) -C $(top_builddir)/contrib/a52dec
 
 if ENABLE_A52DEC
 xineplug_LTLIBRARIES = xineplug_decode_a52.la
 endif
 
-if WITH_EXTERNAL_A52DEC
-external_libs = -la52
-internal_sources =
-else
-external_libs =
-internal_sources = bitstream.c bit_allocate.c downmix.c imdct.c parse.c
-endif
-
-xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c $(internal_sources)
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm
+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)