[SCM] libav/experimental: fix building test programs with gnu make 3.82

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:19:57 UTC 2013


The following commit has been merged in the experimental branch:
commit a854bcdbec688189786a71131d43605b4185bd79
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Tue Dec 7 16:42:25 2010 +0000

    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

diff --git a/subdir.mak b/subdir.mak
index 36a40d3..8a407fe 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list