diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2001-12-27 21:06:08 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2001-12-27 21:06:08 +0000 |
| commit | 7fec2e354c27250be1207159ab946e7fa10aaf7b (patch) | |
| tree | ab8a8c9a6fd076dcd59552f99f86c02117c64147 /src/libffmpeg/libavcodec/Makefile.am | |
| parent | c811e61c80f28552251d296eb205f21175fcef93 (diff) | |
| download | xine-lib-7fec2e354c27250be1207159ab946e7fa10aaf7b.tar.gz xine-lib-7fec2e354c27250be1207159ab946e7fa10aaf7b.tar.bz2 | |
updating ffmpeg to cvs version as 26-12-2001
CVS patchset: 1315
CVS date: 2001/12/27 21:06:08
Diffstat (limited to 'src/libffmpeg/libavcodec/Makefile.am')
| -rw-r--r-- | src/libffmpeg/libavcodec/Makefile.am | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index c2ffc84bc..8e2a6a4df 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -2,6 +2,8 @@ ## Process this file with automake to produce Makefile.in ## +SUBDIRS = armv4l i386 mlib + #CFLAGS = -D_FILE_OFFSET_BITS=64 @GLOBAL_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H CFLAGS = @GLOBAL_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H @@ -11,28 +13,22 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec.la -if HAVE_FFMMX -mmx_modules = mpegvideo_mmx.c sad_mmx.s dsputil_mmx.c idct_mmx.c -#mmx_modules = mpegvideo_mmx.c sad_mmx.s -endif - -if HAVE_MLIB -mlib_modules = dsputil_mlib.c idct_mlib.c -endif - -EXTRA_DIST = mpegvideo_mmx.c sad_mmx.s dsputil_mmx.c idct_mmx.c \ - dsputil_mlib.c idct_mlib.c - -libavcodec_la_SOURCES = dsputil.c fdctref.c jfdctfst.c mpeg12.c \ - utils.c rv10.c h263.c jrevdct.c \ - common.c h263dec.c msmpeg4.c \ - mpegvideo.c mjpeg.c motion_est.c \ - $(mmx_modules) $(mlib_modules) +libavcodec_la_SOURCES = common.c utils.c mpegvideo.c h263.c jrevdct.c jfdctfst.c \ + mjpeg.c dsputil.c \ + motion_est.c imgconvert.c msmpeg4.c \ + mpeg12.c h263dec.c rv10.c simple_idct.c +#imgresample.c + +libavcodec_la_LDFLAGS = \ + $(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \ + $(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \ + $(top_builddir)/src/libffmpeg/libavcodec/mlib/libavcodec_mlib.la \ + -avoid-version -module -noinst_HEADERS = avcodec.h dsputil.h mpegvideo.h dsputil_mmx_avg.h\ +noinst_HEADERS = avcodec.h dsputil.h mpegvideo.h \ common.h h263data.h mpeg4data.h msmpeg4data.h \ - mpeg12data.h + mpeg12data.h simple_idct.h .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< |