20 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 7da2f8a21..434049db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1114,6 +1114,7 @@ doc/hackersguide/Makefile
 doc/faq/Makefile
 doc/Doxyfile
 contrib/Makefile
+contrib/gsm610/Makefile
 contrib/libdca/Makefile
 contrib/libmpcdec/Makefile
 contrib/libxdg-basedir/Makefile
@@ -1168,7 +1169,6 @@ src/libw32dll/qtx/Makefile
 src/libw32dll/qtx/qtxsdk/Makefile
 src/libxinevdec/Makefile
 src/libxineadec/Makefile
-src/libxineadec/gsm610/Makefile
 src/libreal/Makefile
 src/post/Makefile
 src/post/planar/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index bb86eb480..76b63d100 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libmpcdec libxdg-basedir libdca nosefart
+SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610
 
 srcdir = $(shell cd @srcdir@; pwd)
 
diff --git a/src/libxineadec/gsm610/Makefile.am b/contrib/gsm610/Makefile.am
index f2011dfd4..f2011dfd4 100644
--- a/src/libxineadec/gsm610/Makefile.am
+++ b/contrib/gsm610/Makefile.am
diff --git a/src/libxineadec/gsm610/add.c b/contrib/gsm610/add.c
index cd4b5dd3b..cd4b5dd3b 100644
--- a/src/libxineadec/gsm610/add.c
+++ b/contrib/gsm610/add.c
diff --git a/src/libxineadec/gsm610/decode.c b/contrib/gsm610/decode.c
index 66dcab665..66dcab665 100644
--- a/src/libxineadec/gsm610/decode.c
+++ b/contrib/gsm610/decode.c
diff --git a/src/libxineadec/gsm610/gsm.h b/contrib/gsm610/gsm.h
index 34ad8f7a5..34ad8f7a5 100644
--- a/src/libxineadec/gsm610/gsm.h
+++ b/contrib/gsm610/gsm.h
diff --git a/src/libxineadec/gsm610/gsm_config.h b/contrib/gsm610/gsm_config.h
index a40004221..a40004221 100644
--- a/src/libxineadec/gsm610/gsm_config.h
+++ b/contrib/gsm610/gsm_config.h
diff --git a/src/libxineadec/gsm610/gsm_create.c b/contrib/gsm610/gsm_create.c
index df80758f0..df80758f0 100644
--- a/src/libxineadec/gsm610/gsm_create.c
+++ b/contrib/gsm610/gsm_create.c
diff --git a/src/libxineadec/gsm610/gsm_decode.c b/contrib/gsm610/gsm_decode.c
index 849818c14..849818c14 100644
--- a/src/libxineadec/gsm610/gsm_decode.c
+++ b/contrib/gsm610/gsm_decode.c
diff --git a/src/libxineadec/gsm610/gsm_destroy.c b/contrib/gsm610/gsm_destroy.c
index 481a74660..481a74660 100644
--- a/src/libxineadec/gsm610/gsm_destroy.c
+++ b/contrib/gsm610/gsm_destroy.c
diff --git a/src/libxineadec/gsm610/long_term.c b/contrib/gsm610/long_term.c
index 625662e1f..625662e1f 100644
--- a/src/libxineadec/gsm610/long_term.c
+++ b/contrib/gsm610/long_term.c
diff --git a/src/libxineadec/gsm610/lpc.c b/contrib/gsm610/lpc.c
index 0f51fa55f..0f51fa55f 100644
--- a/src/libxineadec/gsm610/lpc.c
+++ b/contrib/gsm610/lpc.c
diff --git a/src/libxineadec/gsm610/private.h b/contrib/gsm610/private.h
index 33a5172b0..33a5172b0 100644
--- a/src/libxineadec/gsm610/private.h
+++ b/contrib/gsm610/private.h
diff --git a/src/libxineadec/gsm610/proto.h b/contrib/gsm610/proto.h
index a80ebf9e4..a80ebf9e4 100644
--- a/src/libxineadec/gsm610/proto.h
+++ b/contrib/gsm610/proto.h
diff --git a/src/libxineadec/gsm610/rpe.c b/contrib/gsm610/rpe.c
index 67d94d30e..67d94d30e 100644
--- a/src/libxineadec/gsm610/rpe.c
+++ b/contrib/gsm610/rpe.c
diff --git a/src/libxineadec/gsm610/short_term.c b/contrib/gsm610/short_term.c
index 8222b2caa..8222b2caa 100644
--- a/src/libxineadec/gsm610/short_term.c
+++ b/contrib/gsm610/short_term.c
diff --git a/src/libxineadec/gsm610/table.c b/contrib/gsm610/table.c
index 797685c07..797685c07 100644
--- a/src/libxineadec/gsm610/table.c
+++ b/contrib/gsm610/table.c
diff --git a/src/libxineadec/gsm610/unproto.h b/contrib/gsm610/unproto.h
index f49530c22..f49530c22 100644
--- a/src/libxineadec/gsm610/unproto.h
+++ b/contrib/gsm610/unproto.h
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 3bc08f320..25d1e358a 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -3,8 +3,6 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-SUBDIRS = gsm610
-
 EXTRA_DIST = fooaudio.c
 
 if ENABLE_VORBIS
@@ -29,6 +27,9 @@ $(top_builddir)/contrib/libmpcdec/libmpcdec.la:
 $(top_builddir)/contrib/libdca/libdca.la:
 	$(MAKE) -C $(top_builddir)/contrib/libdca
 
+$(top_builddir)/contrib/gsm610/libgsm610.la:
+	$(MAKE) -C $(top_builddir)/contrib/gsm610
+
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_lpcm.la \
@@ -38,7 +39,8 @@ xineplug_LTLIBRARIES = \
 	$(dts_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
-xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la
+xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/gsm610/libgsm610.la
+xineplug_decode_gsm610_la_CPPFLAGS = -I$(top_srcdir)/contrib/gsm610
 
 xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
 xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index 9c96145e3..e144c5bbf 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -61,8 +61,8 @@
 #include "xineutils.h"
 #include "bswap.h"
 
-#include "gsm610/private.h"
-#include "gsm610/gsm.h"
+#include "private.h"
+#include "gsm.h"
 
 #define AUDIOBUFSIZE 128*1024