diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-03 22:27:25 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-03 22:27:25 +0000 |
| commit | d031764edb6050623f0e399be5a7cbc7bee76249 (patch) | |
| tree | 5712270b75712ad067ecd7c8a807c483b8f0db4a /src/video_dec/libmpeg2new | |
| parent | b4eea697942773917c2b4c8b932e246227ba01d4 (diff) | |
| parent | bc0969908f75c641469ab46e9866c3ee3026a435 (diff) | |
| download | xine-lib-d031764edb6050623f0e399be5a7cbc7bee76249.tar.gz xine-lib-d031764edb6050623f0e399be5a7cbc7bee76249.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmpeg2new/include/Makefile.am => src/video_dec/libmpeg2new/include/Makefile.am
rename : src/libmpeg2new/libmpeg2/Makefile.am => src/video_dec/libmpeg2new/libmpeg2/Makefile.am
Diffstat (limited to 'src/video_dec/libmpeg2new')
| -rw-r--r-- | src/video_dec/libmpeg2new/include/Makefile.am | 3 | ||||
| -rw-r--r-- | src/video_dec/libmpeg2new/libmpeg2/Makefile.am | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/video_dec/libmpeg2new/include/Makefile.am b/src/video_dec/libmpeg2new/include/Makefile.am index 781e6d0b5..91d5575ee 100644 --- a/src/video_dec/libmpeg2new/include/Makefile.am +++ b/src/video_dec/libmpeg2new/include/Makefile.am @@ -1 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = video_out.h mmx.h alpha_asm.h vis.h attributes.h tendra.h mpeg2.h mpeg2convert.h diff --git a/src/video_dec/libmpeg2new/libmpeg2/Makefile.am b/src/video_dec/libmpeg2new/libmpeg2/Makefile.am index 6da65c9f1..f916dacd6 100644 --- a/src/video_dec/libmpeg2new/libmpeg2/Makefile.am +++ b/src/video_dec/libmpeg2new/libmpeg2/Makefile.am @@ -7,6 +7,8 @@ noinst_LTLIBRARIES = libmpeg2.la libmpeg2arch.la libmpeg2_la_SOURCES = alloc.c header.c decode.c slice.c motion_comp.c idct.c libmpeg2_la_LIBADD = libmpeg2arch.la +AM_CPPFLAGS = -I$(srcdir)/../include + libmpeg2arch_la_SOURCES = motion_comp_mmx.c idct_mmx.c \ motion_comp_altivec.c idct_altivec.c \ motion_comp_alpha.c idct_alpha.c \ |