diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2010-12-07 16:42:25 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2010-12-07 16:42:25 +0000 |
| commit | a854bcdbec688189786a71131d43605b4185bd79 (patch) | |
| tree | 6f23ee13eddc52c1652348ec61fe4e6199713022 | |
| parent | b494baf0b0df3322d0b5d67970e182ff463d89d3 (diff) | |
| download | ffmpeg-a854bcdbec688189786a71131d43605b4185bd79.tar.gz | |
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
| -rw-r--r-- | subdir.mak | 4 |
1 files changed, 2 insertions, 2 deletions
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 |