diff --git a/Makefile b/Makefile index 54a10f6fde308b356bd583dfef67096422100177..e7db119be02daf5a7731b0e73704489becf4dc11 100644 --- a/Makefile +++ b/Makefile @@ -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 446ccc19922f16e038783bb12c71d6e61d3f7147..c03d0a5711c5a5a09ab89037e22ae8903a5ec8cc 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 3931aabe50677710afdbd4e30ca0ab13ca12c630..ad6630af92ef17e6e36962bfa9d2ef396d3e78bb 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 8445217ebb500d038e61aa9f7723ed2d8ea69667..da61458df68a39b29d19fbb45bf3fcb05f39ee3e 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)