Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'

* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055': build: Drop arch-specific checkasm Makefiles Merged-by: James Almer <jamrial@gmail.com>
8 years ago · f23078904f
parent 3ddae9eee9 2816f8a8bb
commit f23078904f
4 changed files with 3 additions and 4 deletions
--- 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/%))
--- a/tests/checkasm/aarch64/Makefile
+++ b/tests/checkasm/aarch64/Makefile
@ -1 +0,0 @@
-CHECKASMOBJS += aarch64/checkasm.o
--- a/tests/checkasm/arm/Makefile
+++ b/tests/checkasm/arm/Makefile
@ -1 +0,0 @@
-CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o
--- a/tests/checkasm/x86/Makefile
+++ b/tests/checkasm/x86/Makefile
@ -1 +0,0 @@
-CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o
				`@ -1 +0,0 @@`
				`CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o`