[FFmpeg-cvslog] r11645 - in trunk: common.mak libavcodec/Makefile libavutil/Makefile

[diego]

Author: diego
Date: Mon Jan 28 00:28:56 2008
New Revision: 11645

Log:
Move common test program infrastructure to common.mak.


Modified:
   trunk/common.mak
   trunk/libavcodec/Makefile
   trunk/libavutil/Makefile

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Mon Jan 28 00:28:56 2008
@@ -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

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Mon Jan 28 00:28:56 2008
@@ -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

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Mon Jan 28 00:28:56 2008
@@ -45,15 +45,8 @@ TESTS = $(addsuffix -test$(EXESUF), adle
 
 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)