diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-08 18:43:44 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-08 18:43:44 +0000 |
| commit | 2a5500b13e666a6837d0bb08de9d5f26d7008851 (patch) | |
| tree | cd95424bc29278c818dab0326b60e63583081fb1 | |
| parent | a79f59e31cc89249be48f8e6242c70a78210d631 (diff) | |
| download | ffmpeg-2a5500b13e666a6837d0bb08de9d5f26d7008851.tar.gz | |
Add TESTOBJS make variable for extra objects used by test apps
Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | subdir.mak | 2 |
4 files changed, 4 insertions, 2 deletions
@@ -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) := diff --git a/common.mak b/common.mak index 446ccc1992..c03d0a5711 100644 --- a/common.mak +++ b/common.mak @@ -84,6 +84,7 @@ FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(ALLFFLIBS)) $(LDFLAGS) 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))) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3931aabe50..ad6630af92 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 diff --git a/subdir.mak b/subdir.mak index 8445217ebb..da61458df6 100644 --- a/subdir.mak +++ b/subdir.mak @@ -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) |