diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-31 14:08:52 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-31 14:08:52 +0100 |
| commit | b0607c580af756ff0ccd1229d91b4b6a97c76d24 (patch) | |
| tree | 27f64134720fc9dca224e6313b0505fa43cb8dd8 /src/libmpeg2new | |
| parent | fe2112a1ac52fbf65e2624b978f9d33f04b6af56 (diff) | |
| parent | adebccc0fc011b6d1abe2f682bbfc866dffee73e (diff) | |
| download | xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.gz xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.bz2 | |
Merge -newbuild.
Diffstat (limited to 'src/libmpeg2new')
| -rw-r--r-- | src/libmpeg2new/Makefile.am | 11 | ||||
| -rw-r--r-- | src/libmpeg2new/libmpeg2/Makefile.am | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libmpeg2new/Makefile.am b/src/libmpeg2new/Makefile.am index 49959da86..8c248fdcb 100644 --- a/src/libmpeg2new/Makefile.am +++ b/src/libmpeg2new/Makefile.am @@ -1,13 +1,12 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + SUBDIRS = libmpeg2 xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la -xineplug_decode_mpeg2_la_SOURCES = \ - xine_mpeg2_decoder.c - -xineplug_decode_mpeg2_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBMPEG2_CFLAGS) +xineplug_decode_mpeg2_la_SOURCES = xine_mpeg2_decoder.c xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) ./libmpeg2/libmpeg2.la -xineplug_decode_mpeg2_la_LDFLAGS = $(xineplug_ldflags) - +xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) diff --git a/src/libmpeg2new/libmpeg2/Makefile.am b/src/libmpeg2new/libmpeg2/Makefile.am index f99894f12..2caa3ddc2 100644 --- a/src/libmpeg2new/libmpeg2/Makefile.am +++ b/src/libmpeg2new/libmpeg2/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) + noinst_LTLIBRARIES = libmpeg2.la libmpeg2arch.la libmpeg2_la_SOURCES = alloc.c header.c decode.c slice.c motion_comp.c idct.c @@ -10,4 +12,3 @@ libmpeg2arch_la_SOURCES = motion_comp_mmx.c idct_mmx.c \ motion_comp_alpha.c idct_alpha.c \ motion_comp_vis.c \ cpu_accel.c cpu_state.c - |