[FFmpeg-cvslog] fate: fix acodec/vsynth tests for make 3.81

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue May 29 09:49:44 2012 +0100| [f919cc7df6ab844bc12f89fe7bef4fb915a47725] | committer: Mans Rullgard

fate: fix acodec/vsynth tests for make 3.81

GNU make 3.81 applies pattern rules in declaration order rather than
by stem length as in 3.82.  This moves the more generic patterns above
the more specific ones such that they work with either make version.
Some of the vsynth patterns are also simplified a little.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f919cc7df6ab844bc12f89fe7bef4fb915a47725
---

 tests/fate/acodec.mak |    9 +++++----
 tests/fate/vcodec.mak |   17 +++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 6d5e826..b4d0cea 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -1,3 +1,8 @@
+fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
+fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
+fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
+fate-acodec-%: CMP_UNIT = 2
+
 FATE_ACODEC_PCM = alaw mulaw                                            \
                   s8 u8                                                 \
                   s16be s16le                                           \
@@ -40,10 +45,6 @@ fate-acodec-flac: FMT = flac
 fate-acodec-flac: CODEC = flac -compression_level 2
 
 $(FATE_ACODEC): tests/data/asynth-44100-2.wav
-fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
-fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
-fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
-fate-acodec-%: CMP_UNIT = 2
 
 FATE_AVCONV += $(FATE_ACODEC)
 fate-acodec: $(FATE_ACODEC)
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 075247f..324320e 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -1,3 +1,10 @@
+fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
+fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
+fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
+fate-vsynth%: FMT = avi
+fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
+fate-vsynth%: CMP_UNIT = 1
+
 FATE_VCODEC += asv1
 fate-vsynth%-asv1:               ENCOPTS = -qscale 10
 
@@ -223,16 +230,6 @@ fate-vsynth%-wmv2:               ENCOPTS = -qscale 10
 FATE_VCODEC += yuv
 fate-vsynth%-yuv:                CODEC = rawvideo
 
-fate-vsynth1-%: CODEC = $(word 3, $(subst -, ,$(@)))
-fate-vsynth1-%: FMT   = avi
-fate-vsynth2-%: CODEC = $(word 3, $(subst -, ,$(@)))
-fate-vsynth2-%: FMT   = avi
-
-fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
-fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
-fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
-fate-vsynth%: CMP_UNIT = 1
-
 FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%)
 FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%)