summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/Makefile.am
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-11-01 18:12:53 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-11-01 18:12:53 +0000
commitad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch)
tree24aa3f8a8900028189d268d75854049dfa386794 /src/libffmpeg/libavcodec/Makefile.am
parent72ae3e51758986775949a7ba2002a526d359389f (diff)
downloadxine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.gz
xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.bz2
big ffmpeg patch
* do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER, which will only compile an I-frame-only MPEG1 encoder (speeds up compile time) * fix a lot of warnings in ffmpeg (a good deal of which have already been submitted to the ffmpeg project by Mike) * simplify some Makefiles CVS patchset: 5667 CVS date: 2003/11/01 18:12:53
Diffstat (limited to 'src/libffmpeg/libavcodec/Makefile.am')
-rw-r--r--src/libffmpeg/libavcodec/Makefile.am13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 87d234a17..3f477ded2 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -1,14 +1,9 @@
include $(top_srcdir)/misc/Makefile.common
-SUBDIRS = armv4l i386 mlib alpha libpostproc
+SUBDIRS = armv4l i386 mlib alpha ppc libpostproc
-## we include ppc/* files since auto* doesn't dive into.
-## we also include imgresample.c motion_est.c which are unused
+## we include some unused files
EXTRA_DIST = fdctref.c motion_est_template.c svq3.c wmv2.c \
- ppc/dsputil_ppc.c ppc/libavcodec_ppc_dummy.c ppc/mpegvideo_altivec.c \
- ppc/dsputil_altivec.c ppc/fft_altivec.c ppc/Makefile.am \
- ppc/mpegvideo_ppc.c ppc/dsputil_altivec.h ppc/idct_altivec.c \
- ppc/dsputil_ppc.h ppc/gcc_fixes.h ppc/gmc_altivec.c \
imgresample.c motion_est.c
AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
@@ -74,6 +69,7 @@ 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 \
+ $(top_builddir)/src/libffmpeg/libavcodec/ppc/libavcodec_ppc.la \
-avoid-version -module
@@ -105,6 +101,3 @@ noinst_HEADERS = \
svq1_vlc.h \
vp3data.h \
wmadata.h
-
-.s.lo:
- $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<