[FFmpeg-cvslog] r25918 - trunk/subdir.mak

ramiro subversion
Tue Dec 7 17:42:25 CET 2010

Author: ramiro
Date: Tue Dec  7 17:42:25 2010
New Revision: 25918

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.


Modified: trunk/subdir.mak
--- trunk/subdir.mak	Tue Dec  7 16:25:44 2010	(r25917)
+++ trunk/subdir.mak	Tue Dec  7 17:42:25 2010	(r25918)
@@ -10,10 +10,10 @@ THIS_LIB   := $(SUBDIR)$($(CONFIG_SHARED
-$(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

More information about the ffmpeg-cvslog mailing list