From 2816f8a8bb33bd67fec5e94f5d357918caf4e055 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 14 Oct 2016 01:24:36 +0200 Subject: build: Drop arch-specific checkasm Makefiles They only contain one line and will never contain more. --- 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(-) delete mode 100644 tests/checkasm/aarch64/Makefile delete mode 100644 tests/checkasm/arm/Makefile delete mode 100644 tests/checkasm/x86/Makefile 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 -- cgit v1.2.3