[vlc-commits] commit: contribs: fix FFmpeg target when building ARM ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Tue Jun 29 18:32:14 2010 +0200| [85fadc92b7c93bd2f74e7dae13d602a0adbbe0ea] | committer: Rafaël Carré 

contribs: fix FFmpeg target when building ARM

Specify --target-os=linux when HAVE_LINUX is 1
Don't depend on libvpx on armel

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=85fadc92b7c93bd2f74e7dae13d602a0adbbe0ea
---

 extras/contrib/src/Makefile |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0d488e8..ff8eab4 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
 endif
 
 ifdef HAVE_LINUX
+FFMPEGCONF+= --target-os=linux
 ifdef HAVE_MAEMO
 ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
 FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
@@ -1112,9 +1113,13 @@ else
 ifdef HAVE_UCLIBC
 .ffmpeg: ffmpeg
 else
+ifeq ($(ARCH),armel)
+.ffmpeg: ffmpeg .lame .gsm .zlib
+else
 .ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
 endif
 endif
+endif
 	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@