diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libvorbis/Makefile.am | 14 | ||||
| -rw-r--r-- | src/libxineadec/Makefile.am | 11 | ||||
| -rw-r--r-- | src/libxineadec/xine_vorbis_decoder.c (renamed from src/libvorbis/xine_decoder.c) | 0 |
5 files changed, 10 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 724b87ff4..1e910bbca 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,7 +2647,6 @@ src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile -src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 90f51ee50..86832bf18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ SUBDIRS = \ libw32dll \ libxinevdec \ libxineadec \ - libvorbis \ libtheora \ libspeex \ libreal \ diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am deleted file mode 100644 index 09abced93..000000000 --- a/src/libvorbis/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -libdir = $(XINE_PLUGINDIR) - -if HAVE_VORBIS -vorbis_module = xineplug_decode_vorbis.la -endif - -lib_LTLIBRARIES = $(vorbis_module) - -xineplug_decode_vorbis_la_SOURCES = xine_decoder.c -xineplug_decode_vorbis_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS) $(XINE_LIB) -xineplug_decode_vorbis_la_CFLAGS = $(VORBIS_CFLAGS) $(VISIBILITY_FLAG) -xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 373347aaa..f2e3b4aa0 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -6,10 +6,15 @@ SUBDIRS = gsm610 nosefart AM_LDFLAGS = $(xineplug_ldflags) +if HAVE_VORBIS +vorbis_module = xineplug_decode_vorbis.la +endif + xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ xineplug_decode_nsf.la \ - xineplug_decode_lpcm.la + xineplug_decode_lpcm.la \ + $(vorbis_module) xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG) @@ -22,3 +27,7 @@ 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) diff --git a/src/libvorbis/xine_decoder.c b/src/libxineadec/xine_vorbis_decoder.c index ef8575949..ef8575949 100644 --- a/src/libvorbis/xine_decoder.c +++ b/src/libxineadec/xine_vorbis_decoder.c |