diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 00:57:19 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 00:57:19 +0000 |
| commit | 83953bfe7440f1c99118da6716bc5f7b62013cfe (patch) | |
| tree | 0962712bdd3fb004d208cd3399e5fe490cf513a5 | |
| parent | 435a5d525c9aa9e4a4b174949b2d67d57110aa9b (diff) | |
| download | xine-lib-83953bfe7440f1c99118da6716bc5f7b62013cfe.tar.gz xine-lib-83953bfe7440f1c99118da6716bc5f7b62013cfe.tar.bz2 | |
Back out mpeg2 build changes: separate unit (though used only once).
Also, built files don't end up in the lib directory.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/video_dec/Makefile.am | 20 |
2 files changed, 4 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 743eb9468..ef55a27ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1197,6 +1197,7 @@ src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/spu_dec/Makefile src/video_dec/Makefile +src/video_dec/libmpeg2/Makefile src/video_out/Makefile src/xine-utils/Makefile src/xine-engine/Makefile diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am index 1b0fec998..91246eb4d 100644 --- a/src/video_dec/Makefile.am +++ b/src/video_dec/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = libmpeg2 + include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) @@ -18,8 +20,7 @@ xineplug_LTLIBRARIES = $(image_module) \ $(theora_module) \ xineplug_decode_bitplane.la \ xineplug_decode_rgb.la \ - xineplug_decode_yuv.la \ - xineplug_decode_mpeg2.la + xineplug_decode_yuv.la xineplug_decode_bitplane_la_SOURCES = bitplane.c xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) @@ -37,18 +38,3 @@ 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) |