Enable building of the mpeg2new plugin and fix up its makefiles. diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1239,6 +1239,9 @@ src/spu_dec/Makefile src/spu_dec/Makefile src/video_dec/Makefile src/video_dec/libmpeg2/Makefile +src/libmpeg2new/Makefile +src/libmpeg2new/include/Makefile +src/libmpeg2new/libmpeg2/Makefile src/video_out/Makefile src/video_out/macosx/Makefile src/xine-utils/Makefile diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,6 +14,7 @@ SUBDIRS = \ demuxers \ libw32dll \ libreal \ + libmpeg2new \ post \ combined \ vdr diff --git a/src/libmpeg2new/Makefile.am b/src/libmpeg2new/Makefile.am --- a/src/libmpeg2new/Makefile.am +++ b/src/libmpeg2new/Makefile.am @@ -3,10 +3,10 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBI AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) -SUBDIRS = libmpeg2 +SUBDIRS = include libmpeg2 -xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la +xineplug_LTLIBRARIES = xineplug_decode_mpeg2new.la -xineplug_decode_mpeg2_la_SOURCES = xine_mpeg2_decoder.c -xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) ./libmpeg2/libmpeg2.la -xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) +xineplug_decode_mpeg2new_la_SOURCES = xine_mpeg2new_decoder.c +xineplug_decode_mpeg2new_la_LIBADD = $(XINE_LIB) ./libmpeg2/libmpeg2.la +xineplug_decode_mpeg2new_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) diff --git a/src/libmpeg2new/include/Makefile.am b/src/libmpeg2new/include/Makefile.am --- a/src/libmpeg2new/include/Makefile.am +++ b/src/libmpeg2new/include/Makefile.am @@ -1,3 +1,1 @@ pkginclude_HEADERS = mpeg2.h mpeg2conver -pkginclude_HEADERS = mpeg2.h mpeg2convert.h - -EXTRA_DIST = video_out.h mmx.h alpha_asm.h vis.h attributes.h tendra.h +EXTRA_DIST = mpeg2.h mpeg2convert.h video_out.h mmx.h alpha_asm.h vis.h attributes.h tendra.h