summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-01-27 16:40:07 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-01-27 16:40:07 +0100
commit435a5d525c9aa9e4a4b174949b2d67d57110aa9b (patch)
tree8d61f3f6821ac519ebf81062a10f174c530f453d /src
parent873a841ce7df818c82991dfa2eeafa019043fae4 (diff)
downloadxine-lib-435a5d525c9aa9e4a4b174949b2d67d57110aa9b.tar.gz
xine-lib-435a5d525c9aa9e4a4b174949b2d67d57110aa9b.tar.bz2
Move libmpeg2-based decoder building in video_dec. Avoid one recursive make call.
Diffstat (limited to 'src')
-rw-r--r--src/video_dec/Makefile.am20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am
index 91246eb4d..1b0fec998 100644
--- a/src/video_dec/Makefile.am
+++ b/src/video_dec/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = libmpeg2
-
include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
@@ -20,7 +18,8 @@ xineplug_LTLIBRARIES = $(image_module) \
$(theora_module) \
xineplug_decode_bitplane.la \
xineplug_decode_rgb.la \
- xineplug_decode_yuv.la
+ xineplug_decode_yuv.la \
+ xineplug_decode_mpeg2.la
xineplug_decode_bitplane_la_SOURCES = bitplane.c
xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
@@ -38,3 +37,18 @@ xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS)
xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c
xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS)
xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS)
+
+xineplug_decode_mpeg2_la_SOURCES = libmpeg2/cpu_state.c \
+ libmpeg2/decode.c libmpeg2/header.c libmpeg2/idct.c \
+ libmpeg2/idct_altivec.c libmpeg2/idct_mlib.c \
+ libmpeg2/idct_mmx.c libmpeg2/motion_comp.c \
+ libmpeg2/motion_comp_altivec.c libmpeg2/motion_comp_mmx.c \
+ libmpeg2/motion_comp_mlib.c libmpeg2/motion_comp_vis.c \
+ libmpeg2/slice.c libmpeg2/slice_xvmc.c \
+ libmpeg2/slice_xvmc_vld.c libmpeg2/stats.c \
+ libmpeg2/xine_mpeg2_decoder.c libmpeg2/libmpeg2_accel.c \
+ libmpeg2/vlc.h libmpeg2/mpeg2.h libmpeg2/xvmc.h \
+ libmpeg2/xvmc_vld.h libmpeg2/mpeg2_internal.h \
+ libmpeg2/idct_mlib.h libmpeg2/vis.h libmpeg2/libmpeg2_accel.h
+xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm
+xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS)