5 files changed, 10 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index e81757fa7..1b00ed203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2647,7 +2647,6 @@ src/libspucc/Makefile
 src/libspucmml/Makefile
 src/libspudvb/Makefile
 src/libsputext/Makefile
-src/libspeex/Makefile
 src/libw32dll/Makefile
 src/libw32dll/wine/Makefile
 src/libw32dll/DirectShow/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index e6c684819..6718b4805 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS = \
 	libw32dll \
 	libxinevdec \
 	libxineadec \
-	libspeex \
 	libreal \
 	libfaad \
         libmusepack \
diff --git a/src/libspeex/Makefile.am b/src/libspeex/Makefile.am
deleted file mode 100644
index bfe6f35b9..000000000
--- a/src/libspeex/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-libdir = $(XINE_PLUGINDIR)
-
-if HAVE_SPEEX
-speex_module = xineplug_decode_speex.la
-endif
-
-lib_LTLIBRARIES = $(speex_module)
-
-xineplug_decode_speex_la_SOURCES = xine_decoder.c
-xineplug_decode_speex_la_LIBADD = $(SPEEX_LIBS) $(XINE_LIB)
-xineplug_decode_speex_la_CFLAGS = $(VISIBILITY_FLAGS) $(SPEEX_CFLAGS)
-xineplug_decode_speex_la_LDFLAGS = -avoid-version -module
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index f2e3b4aa0..b2ffcf078 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -10,11 +10,16 @@ if HAVE_VORBIS
 vorbis_module = xineplug_decode_vorbis.la
 endif
 
+if HAVE_SPEEX
+speex_module = xineplug_decode_speex.la
+endif
+
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_nsf.la \
 	xineplug_decode_lpcm.la \
-	$(vorbis_module)
+	$(vorbis_module) \
+	$(speex_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG)
@@ -31,3 +36,7 @@ xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
 xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c
 xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
 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)
diff --git a/src/libspeex/xine_decoder.c b/src/libxineadec/xine_speex_decoder.c
index b729dc3bb..b729dc3bb 100644
--- a/src/libspeex/xine_decoder.c
+++ b/src/libxineadec/xine_speex_decoder.c