aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-01-27 23:28:56 +0000
committerDiego Biurrun <diego@biurrun.de>2008-01-27 23:28:56 +0000
commitbca9e0bcf17693f77d9e661e2e63baf2722797bc (patch)
tree3a4810f2c0e84881fcea9341ef7122b9ea786683
parentfe34942e922aa9574ea7cc139b32a7e076fd7607 (diff)
downloadffmpeg-bca9e0bcf17693f77d9e661e2e63baf2722797bc.tar.gz
Move common test program infrastructure to common.mak.
Originally committed as revision 11645 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak9
-rw-r--r--libavcodec/Makefile9
-rw-r--r--libavutil/Makefile9
3 files changed, 9 insertions, 18 deletions
diff --git a/common.mak b/common.mak
index 8da643cc11..b809748f3e 100644
--- a/common.mak
+++ b/common.mak
@@ -52,7 +52,7 @@ depend dep: $(SRCS)
clean::
rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
- *.def *.dll.a *.exp *.ho *.map
+ *.def *.dll.a *.exp *.ho *.map $(TESTS)
distclean: clean
rm -f .depend
@@ -98,6 +98,11 @@ uninstall-headers::
rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
-.PHONY: all depend dep clean distclean install* uninstall*
+tests: $(TESTS)
+
+%-test$(EXESUF): %.c $(LIBNAME)
+ $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
+
+.PHONY: all depend dep clean distclean install* uninstall* tests
-include .depend
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 67a5c6ae05..dd3202dd94 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -472,17 +472,10 @@ clean::
ps2/*.o ps2/*~ \
sh4/*.o sh4/*~ \
sparc/*.o sparc/*~ \
- apiexample$(EXESUF) $(TESTS)
-
-tests: apiexample$(EXESUF) $(TESTS)
+ apiexample$(EXESUF)
cpuid-test$(EXESUF): i386/cputest.c
apiexample$(EXESUF): apiexample.o $(LIBNAME)
dct-test$(EXESUF): dct-test.o fdctref.o $(LIBNAME)
fft-test$(EXESUF): fft-test.o $(LIBNAME)
motion-test$(EXESUF): motion-test.o $(LIBNAME)
-
-%-test$(EXESUF): %.c $(LIBNAME)
- $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
-
-.PHONY: tests
diff --git a/libavutil/Makefile b/libavutil/Makefile
index c5306709a0..04fd16fac0 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -45,15 +45,8 @@ TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat t
include ../common.mak
-tests: $(TESTS)
-
-%-test$(EXESUF): %.c $(LIBNAME)
- $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
-
lzo-test$(EXESUF): lzo.c $(LIBNAME)
$(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o $@ $^ $(EXTRALIBS) -llzo2
clean::
- rm -f $(TESTS) lzo-test$(EXESUF)
-
-.PHONY: tests
+ rm -f lzo-test$(EXESUF)