diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 18:01:47 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 18:01:47 -0300 |
| commit | f23078904f99fc6d19d05013d8ef132c386ec8b8 (patch) | |
| tree | 36ea3be30580efb22dc8f35ce8b546c13a280643 | |
| parent | 3ddae9eee9a8bc4c667a66a9b1db36b84edca436 (diff) | |
| parent | 2816f8a8bb33bd67fec5e94f5d357918caf4e055 (diff) | |
Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'
* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055':
build: Drop arch-specific checkasm Makefiles
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | tests/checkasm/Makefile | 4 | ||||
| -rw-r--r-- | tests/checkasm/aarch64/Makefile | 1 | ||||
| -rw-r--r-- | tests/checkasm/arm/Makefile | 1 | ||||
| -rw-r--r-- | tests/checkasm/x86/Makefile | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 29b7761c62..94a19740da 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 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 |