Merge with main repository.

--HG--
rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c
rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c

1 files changed, 28 insertions, 13 deletions

diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 7f34b4bfd..b2ffcf078 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -2,26 +2,41 @@ include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = fooaudio.c
 
-libdir = $(XINE_PLUGINDIR)
-
 SUBDIRS = gsm610 nosefart
 
-lib_LTLIBRARIES = \
+AM_LDFLAGS = $(xineplug_ldflags)
+
+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_nsf.la \
+	xineplug_decode_lpcm.la \
+	$(vorbis_module) \
+	$(speex_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG)
-xineplug_decode_gsm610_la_LDFLAGS = -avoid-version -module
-xineplug_decode_gsm610_la_LIBADD = \
-	$(XINE_LIB) \
-	$(top_builddir)/src/libxineadec/gsm610/libgsm610.la
+xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la
 
 xineplug_decode_nsf_la_SOURCES = nsf.c
 xineplug_decode_nsf_la_CFLAGS = $(VISIBILITY_FLAG) -DNSF_PLAYER -fno-strict-aliasing
-xineplug_decode_nsf_la_LDFLAGS = -avoid-version -module
-xineplug_decode_nsf_la_LIBADD = -lm \
-	$(XINE_LIB) \
-	$(top_builddir)/src/libxineadec/nosefart/libnosefart.la
+xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) -lm nosefart/libnosefart.la
+
+xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
+xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG)
+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)
 
-# noinst_HEADERS = 
+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)