summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-03 01:36:01 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-03 01:36:01 +0200
commit0ff1e17301d2483165d294d9d1906dbfc5be55af (patch)
treef7f9f4b564cf7d3f8419cd34b7847c822d63911b
parentc34f4793d99f3ccbdfe6bf718993df1d3468f40a (diff)
downloadxine-lib-0ff1e17301d2483165d294d9d1906dbfc5be55af.tar.gz
xine-lib-0ff1e17301d2483165d294d9d1906dbfc5be55af.tar.bz2
Support the new makefile style for FFmpeg building.
-rw-r--r--src/libffmpeg/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 9ea37cd17..32a6072c5 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -13,13 +13,13 @@ link_ffmpeg = \
$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a
$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a:
- $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libavcodec/libavcodec.a
+ $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavcodec/libavcodec.a
$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a:
- $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libavutil/libavutil.a
+ $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavutil/libavutil.a
$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
- $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a
+ $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libpostproc/libpostproc.a
endif
# ffmpeg_config.h is generated by configure