fix building of test programs (make tests)

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12867 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/common.mak b/common.mak
index 2ec0dffd133e6f30b9aabe56816edac5266b984a..93caa00f4d8598f77bceaf9faaed473587d77e73 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -70,11 +70,14 @@ LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
 DISTCLEANSUFFIXES = *.d
 
 define RULES
-$(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME)
-       $(CC) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS)
+$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
+       $(CC) $(FFLDFLAGS) -o $$@ $$^ $(SUBDIR)$(LIBNAME) $(FFEXTRALIBS)
 
-$(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME)
-       $(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS)
+$(SUBDIR)%-test.o: $(SUBDIR)%.c
+       $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
+
+$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
+       $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
 
 clean::
        rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7473cd6b54b61b15f08fc53cf933841289c2ee90..32ced9279a080870f67ac405c568948a01d45548 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -473,8 +473,6 @@ DIRS = alpha armv4l bfin i386 mlib ppc ps2 sh4 sparc
 
 include $(SUBDIR)../subdir.mak
 
-$(SUBDIR)cpuid-test$(EXESUF): $(SUBDIR)i386/cputest.c
+$(SUBDIR)cpuid-test$(EXESUF): $(SUBDIR)i386/cputest.o
 $(SUBDIR)apiexample$(EXESUF): $(SUBDIR)apiexample.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dct-test.o fdctref.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)fft-test$(EXESUF): $(SUBDIR)fft-test.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)motion-test$(EXESUF): $(SUBDIR)motion-test.o $(SUBDIR)$(LIBNAME)
+$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)fdctref.o