[FFmpeg-cvslog] r22335 - in trunk: Makefile common.mak libavcodec/Makefile subdir.mak

[mru]

Author: mru
Date: Mon Mar  8 19:43:44 2010
New Revision: 22335

Log:
Add TESTOBJS make variable for extra objects used by test apps

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

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Mar  8 19:43:41 2010	(r22334)
+++ trunk/Makefile	Mon Mar  8 19:43:44 2010	(r22335)
@@ -56,7 +56,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 
 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
-               HOSTPROGS BUILT_HEADERS
+               HOSTPROGS BUILT_HEADERS TESTOBJS
 
 define RESET
 $(1) :=

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Mon Mar  8 19:43:41 2010	(r22334)
+++ trunk/common.mak	Mon Mar  8 19:43:44 2010	(r22335)
@@ -84,6 +84,7 @@ FFLDFLAGS   := $(addprefix -L$(BUILD_ROO
 
 EXAMPLES  := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
 OBJS      := $(addprefix $(SUBDIR),$(OBJS))
+TESTOBJS  := $(addprefix $(SUBDIR),$(TESTOBJS))
 TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
 HOSTOBJS  := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS)))
 HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS)))

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Mon Mar  8 19:43:41 2010	(r22334)
+++ trunk/libavcodec/Makefile	Mon Mar  8 19:43:44 2010	(r22335)
@@ -720,6 +720,7 @@ EXAMPLES = api
 TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow
 TESTPROGS-$(ARCH_X86) += x86/cpuid
 TESTPROGS-$(HAVE_MMX) += motion
+TESTOBJS = dctref.o
 
 HOSTPROGS = costablegen
 

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Mon Mar  8 19:43:41 2010	(r22334)
+++ trunk/subdir.mak	Mon Mar  8 19:43:44 2010	(r22335)
@@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
 
-$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o: CPPFLAGS += -DHAVE_AV_CONFIG_H
+$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
 
 ifdef CONFIG_STATIC
 all: $(SUBDIR)$(LIBNAME)