Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:01:47 +0000 (18:01 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:01:47 +0000 (18:01 -0300)
* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055':
  build: Drop arch-specific checkasm Makefiles

Merged-by: James Almer <jamrial@gmail.com>
1  2 
tests/checkasm/Makefile

@@@ -23,14 -18,10 +23,16 @@@ AVCODECOBJS-$(CONFIG_VP9_DECODER
  
  CHECKASMOBJS-$(CONFIG_AVCODEC)          += $(AVCODECOBJS-yes)
  
 +# libavfilter tests
 +AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
 +AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
 +
 +CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
 +
  
- -include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
+ CHECKASMOBJS-$(ARCH_AARCH64)            += aarch64/checkasm.o
+ CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL)   += arm/checkasm.o
+ CHECKASMOBJS-$(HAVE_YASM)               += x86/checkasm.o
  
  CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
  CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))