aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-14 01:24:36 +0200
committerDiego Biurrun <diego@biurrun.de>2016-10-17 16:25:38 +0200
commit2816f8a8bb33bd67fec5e94f5d357918caf4e055 (patch)
tree6d9757d6a4c60309573f4e1725e450f9d067d1e6
parent93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81 (diff)
downloadffmpeg-2816f8a8bb33bd67fec5e94f5d357918caf4e055.tar.gz
build: Drop arch-specific checkasm Makefiles
They only contain one line and will never contain more.
-rw-r--r--tests/checkasm/Makefile4
-rw-r--r--tests/checkasm/aarch64/Makefile1
-rw-r--r--tests/checkasm/arm/Makefile1
-rw-r--r--tests/checkasm/x86/Makefile1
4 files changed, 3 insertions, 4 deletions
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 9b3df55673..22cf3db538 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -19,7 +19,9 @@ AVCODECOBJS-$(CONFIG_VP9_DECODER) += vp9dsp.o
CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-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 02ba6cafa9..0000000000
--- 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 55f2383d4c..0000000000
--- 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 e1bef76017..0000000000
--- a/tests/checkasm/x86/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o