contribs: fix FFmpeg target when building ARM

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0d488e8cb11e9d35e0e0f7d802690c2578850abf..ff8eab463daeac1879878cfb4b85dc00c23a5c09 100644 (file)
--- 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,8 +1113,12 @@ 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 $@