diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libtheora/Makefile.am | 15 | ||||
| -rw-r--r-- | src/libxinevdec/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libxinevdec/xine_theora_decoder.c (renamed from src/libtheora/xine_decoder.c) | 0 |
5 files changed, 8 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 1e910bbca..e81757fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,7 +2647,6 @@ src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile -src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 86832bf18..e6c684819 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ SUBDIRS = \ libw32dll \ libxinevdec \ libxineadec \ - libtheora \ libspeex \ libreal \ libfaad \ diff --git a/src/libtheora/Makefile.am b/src/libtheora/Makefile.am deleted file mode 100644 index d3813765d..000000000 --- a/src/libtheora/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(THEORA_CFLAGS) - -libdir = $(XINE_PLUGINDIR) - -if HAVE_THEORA -theora_module = xineplug_decode_theora.la -endif - -lib_LTLIBRARIES = $(theora_module) - -xineplug_decode_theora_la_SOURCES = xine_decoder.c -xineplug_decode_theora_la_LIBADD = $(OGG_LIBS) $(THEORA_LIBS) $(XINE_LIB) -xineplug_decode_theora_la_LDFLAGS = -avoid-version -module diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 903399cbb..87ee050e6 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -13,8 +13,13 @@ if HAVE_GDK_PIXBUF gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la endif +if HAVE_THEORA +theora_module = xineplug_decode_theora.la +endif + xineplug_LTLIBRARIES = $(image_module) \ $(gdkpixbuf_module) \ + $(theora_module) \ xineplug_decode_bitplane.la \ xineplug_decode_rgb.la \ xineplug_decode_yuv.la @@ -36,3 +41,6 @@ xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS) +xineplug_decode_theora_la_SOURCES = xine_theora_decoder.c +xineplug_decode_theora_la_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS) +xineplug_decode_theora_la_LIBADD = $(XINE_LIB) $(OGG_LIBS) $(THEORA_LIBS) diff --git a/src/libtheora/xine_decoder.c b/src/libxinevdec/xine_theora_decoder.c index 032f8800f..032f8800f 100644 --- a/src/libtheora/xine_decoder.c +++ b/src/libxinevdec/xine_theora_decoder.c |