ffmpeg | branch: master | James Almer <[email protected]> | Thu Mar 23 18:01:47 2017 -0300| [f23078904f99fc6d19d05013d8ef132c386ec8b8] | committer: James Almer
Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055' * commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055': build: Drop arch-specific checkasm Makefiles Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f23078904f99fc6d19d05013d8ef132c386ec8b8 --- tests/checkasm/Makefile | 4 +++- tests/checkasm/aarch64/Makefile | 1 - tests/checkasm/arm/Makefile | 1 - tests/checkasm/x86/Makefile | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 29b7761..94a1974 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -30,7 +30,9 @@ 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/%)) diff --git a/tests/checkasm/aarch64/Makefile b/tests/checkasm/aarch64/Makefile deleted file mode 100644 index 02ba6ca..0000000 --- a/tests/checkasm/aarch64/Makefile +++ /dev/null @@ -1 +0,0 @@ -CHECKASMOBJS += aarch64/checkasm.o diff --git a/tests/checkasm/arm/Makefile b/tests/checkasm/arm/Makefile deleted file mode 100644 index 55f2383..0000000 --- a/tests/checkasm/arm/Makefile +++ /dev/null @@ -1 +0,0 @@ -CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o diff --git a/tests/checkasm/x86/Makefile b/tests/checkasm/x86/Makefile deleted file mode 100644 index e1bef76..0000000 --- a/tests/checkasm/x86/Makefile +++ /dev/null @@ -1 +0,0 @@ -CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o ====================================================================== diff --cc tests/checkasm/Makefile index 29b7761,22cf3db..94a1974 --- a/tests/checkasm/Makefile +++ b/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/%)) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
