From a854bcdbec688189786a71131d43605b4185bd79 Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Tue, 7 Dec 2010 16:42:25 +0000
Subject: fix building test programs with gnu make 3.82

Test programs may be named either %.c or %-test.c. In some cases (ie. fft),
both files exist and make has to choose which rule to use. Up to gnu make
3.81, rules were applied in definition order, in this case favouring the
generic %.c rule from common.mak. gnu make 3.82 uses a shortest stem first
order, applying definition order for same length stems. In this case,
%-test.c must come first in order for make to pick the proper source file.

Originally committed as revision 25918 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 subdir.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'subdir.mak')

diff --git a/subdir.mak b/subdir.mak
index 36a40d375a..8a407fe164 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -10,10 +10,10 @@ THIS_LIB   := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
 all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
 all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)
 
-$(SUBDIR)%-test.o: $(SUBDIR)%.c
+$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^
 
-$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
+$(SUBDIR)%-test.o: $(SUBDIR)%.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^
 
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
-- 
cgit v1.2.3