From bca9e0bcf17693f77d9e661e2e63baf2722797bc Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 27 Jan 2008 23:28:56 +0000 Subject: [PATCH] Move common test program infrastructure to common.mak. Originally committed as revision 11645 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 9 +++++++-- libavcodec/Makefile | 9 +-------- libavutil/Makefile | 9 +-------- 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)