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

diff --combined tests/checkasm/Makefile
index 29b7761c6238d929666e74f87cf50e91f2965425,22cf3db538cb6d136b45edd51f3b95fc3dcf7cc1..94a19740daec2562f2c9103ecaf3d528e9adebfb
@@@ -3,34 -3,25 +3,36 @@@
  AVCODECOBJS-$(CONFIG_AUDIODSP)          += audiodsp.o
  AVCODECOBJS-$(CONFIG_BLOCKDSP)          += blockdsp.o
  AVCODECOBJS-$(CONFIG_BSWAPDSP)          += bswapdsp.o
 +AVCODECOBJS-$(CONFIG_FLACDSP)           += flacdsp.o
  AVCODECOBJS-$(CONFIG_FMTCONVERT)        += fmtconvert.o
 -AVCODECOBJS-$(CONFIG_HUFFYUVDSP)        += huffyuvdsp.o
  AVCODECOBJS-$(CONFIG_H264DSP)           += h264dsp.o
  AVCODECOBJS-$(CONFIG_H264PRED)          += h264pred.o
  AVCODECOBJS-$(CONFIG_H264QPEL)          += h264qpel.o
 +AVCODECOBJS-$(CONFIG_LLVIDDSP)          += llviddsp.o
  AVCODECOBJS-$(CONFIG_VP8DSP)            += vp8dsp.o
 +AVCODECOBJS-$(CONFIG_VIDEODSP)          += videodsp.o
  
  # decoders/encoders
 -AVCODECOBJS-$(CONFIG_DCA_DECODER)       += dcadsp.o synth_filter.o
 -AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_mc.o hevc_idct.o
 +AVCODECOBJS-$(CONFIG_ALAC_DECODER)      += alacdsp.o
 +AVCODECOBJS-$(CONFIG_DCA_DECODER)       += synth_filter.o
 +AVCODECOBJS-$(CONFIG_JPEG2000_DECODER)  += jpeg2000dsp.o
 +AVCODECOBJS-$(CONFIG_PIXBLOCKDSP)       += pixblockdsp.o
 +AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_idct.o
  AVCODECOBJS-$(CONFIG_V210_ENCODER)      += v210enc.o
  AVCODECOBJS-$(CONFIG_VP9_DECODER)       += vp9dsp.o
  
  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/%))
@@@ -41,8 -32,6 +43,8 @@@ CHECKASMDIRS := $(sort $(dir $(CHECKASM
  $(CHECKASMOBJS): | $(CHECKASMDIRS)
  OBJDIRS += $(CHECKASMDIRS)
  
 +tests/checkasm/checkasm.o: CFLAGS += -Umain
 +
  CHECKASM := tests/checkasm/checkasm$(EXESUF)
  
  $(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
@@@ -50,7 -39,7 +52,7 @@@
  
  checkasm: $(CHECKASM)
  
 -clean:: checkasmclean
 +testclean:: checkasmclean
  
  checkasmclean:
        $(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%)