summaryrefslogtreecommitdiffstats
path: root/rules/ffmpeg.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-03-09 00:49:31 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-03-09 00:49:31 +0000
commit2724dc0cd74b716b1ef770d847a5509291ce4bef (patch)
tree02621576dd8da1270d81eb3ac0e77fefee1d9574 /rules/ffmpeg.make
parent3b5825254a4b729e2d981637ca3ed449eabaa133 (diff)
downloadptxdist-2724dc0cd74b716b1ef770d847a5509291ce4bef.tar.gz
ptxdist-2724dc0cd74b716b1ef770d847a5509291ce4bef.tar.xz
Don't display ffmpeg warning on arm-ixp-big when FFMPEG packet is not selected
Warning from rules/ffmpeg.make is displayed on arm-ixp-big even if FFMPEG package has not been selected. Signed-off-by: Jon Ringle <jon@ringle.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10028 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/ffmpeg.make')
-rw-r--r--rules/ffmpeg.make2
1 files changed, 2 insertions, 0 deletions
diff --git a/rules/ffmpeg.make b/rules/ffmpeg.make
index 0914106af..d5d4bde80 100644
--- a/rules/ffmpeg.make
+++ b/rules/ffmpeg.make
@@ -186,6 +186,7 @@ ifdef PTXCONF_ARCH_ARM
--disable-mmx \
--disable-iwmmxt
else
+ ifdef PTXCONF_FFMPEG
$(warning Please define the config options for this CPU type!)
endif
endif
@@ -193,6 +194,7 @@ ifdef PTXCONF_ARCH_ARM
endif
endif
endif
+ endif
endif
ifdef PTXCONF_ARCH_PPC