diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-16 15:05:19 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-16 15:05:19 +0000 |
| commit | f62eed3209aab6fc642e66b18cc71d526517aadb (patch) | |
| tree | 4b56b352759d4de7196a6ce564cf2ff88dfd08b2 /src/video_dec/libmpeg2new | |
| parent | d8a50c1e20367be95911533c62637c23b809b916 (diff) | |
| parent | c3580b925a6c33105ee483d3c616a16f8ce0bba9 (diff) | |
| download | xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.gz xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/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/Makefile.am | 6 | ||||
| -rw-r--r-- | src/video_dec/libmpeg2new/libmpeg2/Makefile.am | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/video_dec/libmpeg2new/Makefile.am b/src/video_dec/libmpeg2new/Makefile.am index f79b8aba9..3f704bad6 100644 --- a/src/video_dec/libmpeg2new/Makefile.am +++ b/src/video_dec/libmpeg2new/Makefile.am @@ -6,7 +6,11 @@ AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = include libmpeg2 -xineplug_LTLIBRARIES = xineplug_decode_mpeg2new.la +if ENABLE_MPEG2NEW +mpeg2new_module = xineplug_decode_mpeg2new.la +endif + +xineplug_LTLIBRARIES = $(mpeg2new_module) xineplug_decode_mpeg2new_la_SOURCES = \ xine_mpeg2new_decoder.c diff --git a/src/video_dec/libmpeg2new/libmpeg2/Makefile.am b/src/video_dec/libmpeg2new/libmpeg2/Makefile.am index f916dacd6..7a49f8726 100644 --- a/src/video_dec/libmpeg2new/libmpeg2/Makefile.am +++ b/src/video_dec/libmpeg2new/libmpeg2/Makefile.am @@ -2,7 +2,11 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -noinst_LTLIBRARIES = libmpeg2.la libmpeg2arch.la +if ENABLE_MPEG2NEW +mpeg2new_libs = libmpeg2.la libmpeg2arch.la +endif + +noinst_LTLIBRARIES = $(mpeg2new_libs) libmpeg2_la_SOURCES = alloc.c header.c decode.c slice.c motion_comp.c idct.c libmpeg2_la_LIBADD = libmpeg2arch.la |