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>
tests/checkasm/Makefile
tests/checkasm/aarch64/Makefile [deleted file]
tests/checkasm/arm/Makefile [deleted file]
tests/checkasm/x86/Makefile [deleted file]

index 29b7761c6238d929666e74f87cf50e91f2965425..94a19740daec2562f2c9103ecaf3d528e9adebfb 100644 (file)
@@ -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 (file)
index 02ba6ca..0000000
+++ /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 (file)
index 55f2383..0000000
+++ /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 (file)
index e1bef76..0000000
+++ /dev/null
@@ -1 +0,0 @@
-CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o