[FFmpeg-cvslog] build: Drop arch-specific checkasm Makefiles

Diego Biurrun git at videolan.org
Thu Mar 23 23:02:52 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Oct 14 01:24:36 2016 +0200| [2816f8a8bb33bd67fec5e94f5d357918caf4e055] | committer: Diego Biurrun

build: Drop arch-specific checkasm Makefiles

They only contain one line and will never contain more.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2816f8a8bb33bd67fec5e94f5d357918caf4e055
---

 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(-)

diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 9b3df55..22cf3db 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 02ba6ca..0000000
--- 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 55f2383..0000000
--- 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 e1bef76..0000000
--- a/tests/checkasm/x86/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o



More information about the ffmpeg-cvslog mailing list