multimedia/ffmpeg: simplify ARCH workaround

ARCH is clobbered via .MAKEFLAGS in Mk/bsd.port.mk since r20327.

Approved by:	portmgr blanket

24 files changed, 7 insertions, 211 deletions

diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index f6e53bc7db41..f94734d5078a 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -27,6 +27,7 @@ CMAKE_ARGS+=	-DAVIDEMUX_PACKAGER=none
 CMAKE_ARGS+=	-DQT5:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
+NOPRECIOUSMAKEVARS=	yes # ARCH
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
diff --git a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
deleted file mode 100644
index 79dcae260068..000000000000
--- a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- avidemux_core/ffmpeg_package/patches/Makefile.patch.orig	2015-06-01 05:59:45 UTC
-+++ avidemux_core/ffmpeg_package/patches/Makefile.patch
-@@ -0,0 +1,11 @@
-+--- Makefile.orig	2015-03-16 20:25:47.000000000 +0100
-++++ Makefile
-+@@ -92,7 +92,7 @@
-+ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
-+ SUBDIR := $(1)/
-+ include $(SRC_PATH)/$(1)/Makefile
-+--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-++-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
-+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
-+ include $(SRC_PATH)/library.mak
-+ endef
diff --git a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
index 0e350422a3ce..180e870986ea 100644
--- a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
+++ b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
@@ -1,6 +1,6 @@
 --- avidemux_core/ffmpeg_package/patches/configure.patch.orig	2015-06-01 05:59:45 UTC
 +++ avidemux_core/ffmpeg_package/patches/configure.patch
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,16 @@
 +--- configure.orig	2015-03-16 20:26:04.000000000 +0100
 ++++ configure
 +@@ -2733,12 +2733,7 @@
@@ -17,12 +17,3 @@
 + cpu="generic"
 + intrinsics="none"
 + 
-+@@ -5621,7 +5616,7 @@
-+ SRC_PATH:=\$(SRC_PATH:.%=..%)
-+ endif
-+ CC_IDENT=$cc_ident
-+-ARCH=$arch
-++FFMPEG_ARCH=$arch
-+ INTRINSICS=$intrinsics
-+ CC=$cc
-+ CXX=$cxx
diff --git a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch
deleted file mode 100644
index 9675afd961cb..000000000000
--- a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- avidemux_core/ffmpeg_package/patches/libavcodec-Makefile.patch.orig	2015-06-01 05:59:45 UTC
-+++ avidemux_core/ffmpeg_package/patches/libavcodec-Makefile.patch
-@@ -0,0 +1,11 @@
-+--- libavcodec/Makefile.orig	2015-03-06 23:35:30.000000000 +0100
-++++ libavcodec/Makefile
-+@@ -858,7 +858,7 @@
-+                                           old_codec_ids.h               \
-+                                           tableprint.h                  \
-+                                           tableprint_vlc.h              \
-+-                                          $(ARCH)/vp56_arith.h          \
-++                                          $(FFMPEG_ARCH)/vp56_arith.h          \
-+ 
-+ SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
-+ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index c2d8a517c2f6..7b947e7ac6b0 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -22,6 +22,7 @@ USES=		compiler:c11 cpe gmake localbase perl5 pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	doc/texi2pod.pl
+NOPRECIOUSMAKEVARS=	yes # ARCH
 
 PORTSCOUT=	limit:^3\.
 
diff --git a/multimedia/ffmpeg/files/patch-Makefile b/multimedia/ffmpeg/files/patch-Makefile
deleted file mode 100644
index 0b2343d83469..000000000000
--- a/multimedia/ffmpeg/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2015-06-19 20:44:35 UTC
-+++ Makefile
-@@ -92,7 +92,7 @@ define DOSUBDIR
- $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
- SUBDIR := $(1)/
- include $(SRC_PATH)/$(1)/Makefile
---include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-+-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index a706327f2952..3d5a40fc35b0 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -24,15 +24,6 @@
      check_cflags -Qunused-arguments
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
-@@ -6562,7 +6560,7 @@ ifndef MAIN_MAKEFILE
- SRC_PATH:=\$(SRC_PATH:.%=..%)
- endif
- CC_IDENT=$cc_ident
--ARCH=$arch
-+FFMPEG_ARCH=$arch
- INTRINSICS=$intrinsics
- CC=$cc
- CXX=$cxx
 @@ -6799,7 +6797,7 @@ exec_prefix=\${prefix}
  libdir=$libdir
  includedir=$incdir
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-Makefile b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
deleted file mode 100644
index 254907a12027..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/Makefile.orig	2016-02-15 02:29:38 UTC
-+++ libavcodec/Makefile
-@@ -935,7 +935,7 @@ SKIPHEADERS                            +
-                                           aaccoder_trellis.h            \
-                                           aacenc_quantization.h         \
-                                           aacenc_quantization_misc.h    \
--                                          $(ARCH)/vp56_arith.h          \
-+                                          $(FFMPEG_ARCH)/vp56_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
diff --git a/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile b/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile
deleted file mode 100644
index 22d0ac59003d..000000000000
--- a/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/checkasm/Makefile.orig	2016-10-01 01:12:42 UTC
-+++ tests/checkasm/Makefile
-@@ -24,7 +24,7 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER)
- CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
- 
- 
---include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
-+-include $(SRC_PATH)/tests/checkasm/$(FFMPEG_ARCH)/Makefile
- 
- CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
- CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index 200522dfdddc..bcbf1464f4a3 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -27,6 +27,7 @@ USES=		cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
 USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
 USE_PERL5=	build
 SHEBANG_FILES=	doc/texi2pod.pl
+NOPRECIOUSMAKEVARS=	yes # ARCH
 
 FFMPEG_SUFFIX=	0
 HAS_CONFIGURE=	yes
diff --git a/multimedia/ffmpeg0/files/patch-configure b/multimedia/ffmpeg0/files/patch-configure
index 081e270f3830..7203e24b7d12 100644
--- a/multimedia/ffmpeg0/files/patch-configure
+++ b/multimedia/ffmpeg0/files/patch-configure
@@ -28,12 +28,3 @@
      check_cflags -Qunused-arguments
  elif enabled armcc; then
      # 2523: use of inline assembler is deprecated
-@@ -3322,7 +3322,7 @@
- SRC_PATH="$source_path"
- SRC_PATH_BARE=$source_path
- CC_IDENT=$cc_ident
--ARCH=$arch
-+FFMPEG_ARCH=$arch
- CC=$cc
- AS=$as
- LD=$ld
diff --git a/multimedia/ffmpeg0/files/patch-libavcodec-Makefile b/multimedia/ffmpeg0/files/patch-libavcodec-Makefile
deleted file mode 100644
index bfc359cff690..000000000000
--- a/multimedia/ffmpeg0/files/patch-libavcodec-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/Makefile.orig	2010-08-01 20:33:53.484907333 +0200
-+++ libavcodec/Makefile	2010-08-01 20:34:26.190893400 +0200
-@@ -590,7 +590,7 @@
- 
- OBJS-$(CONFIG_MLIB)                    += mlib/dsputil_mlib.o           \
- 
---include $(SUBDIR)$(ARCH)/Makefile
-+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
- 
- SKIPHEADERS                             = %_tablegen.h
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
diff --git a/multimedia/ffmpeg0/files/patch-libavfilter-Makefile b/multimedia/ffmpeg0/files/patch-libavfilter-Makefile
deleted file mode 100644
index be35a25555cf..000000000000
--- a/multimedia/ffmpeg0/files/patch-libavfilter-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavfilter/Makefile.orig	2011-06-23 16:22:46.163337772 +0200
-+++ libavfilter/Makefile	2011-06-23 16:22:53.731245405 +0200
-@@ -136,7 +136,7 @@
- OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
- 
- 
---include $(SUBDIR)$(ARCH)/Makefile
-+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
- 
- DIRS = x86 libmpcodecs
- 
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index 3f1343c55eaa..a5937e0941de 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -33,6 +33,7 @@ FFMPEG_DESC?=	Use system ffmpeg instead of internal libav
 
 FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0
 FFMPEG_CONFIGURE_WITH=system-ffmpeg
+FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH
 
 FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav
 FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm
@@ -91,11 +92,5 @@ post-patch:
 	@${REINPLACE_CMD} -Ee '/sleep 15/d; /PKG_CONFIG/\
 		s/lib(av(format|codec|util)|postproc|swscale)/&0/g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \
-		${WRKSRC}/gst-libs/ext/libav/Makefile \
-		${WRKSRC}/gst-libs/ext/libav/common.mak \
-		${WRKSRC}/gst-libs/ext/libav/configure \
-		${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \
-		${WRKSRC}/gst-libs/ext/libav/libavfilter/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 28bb528db7cb..0ce3eadaf349 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -20,6 +20,7 @@ USE_XORG=	x11
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+NOPRECIOUSMAKEVARS=	yes # ARCH
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
diff --git a/multimedia/libav/files/patch-Makefile b/multimedia/libav/files/patch-Makefile
deleted file mode 100644
index f7c2cb79a2bd..000000000000
--- a/multimedia/libav/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2016-05-25 00:36:32 UTC
-+++ Makefile
-@@ -129,7 +129,7 @@ define DOSUBDIR
- $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
- SUBDIR := $(1)/
- include $(SRC_PATH)/$(1)/Makefile
---include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-+-include $(SRC_PATH)/$(1)/$(LIBAV_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef
diff --git a/multimedia/libav/files/patch-common.mak b/multimedia/libav/files/patch-common.mak
deleted file mode 100644
index f455be676c3b..000000000000
--- a/multimedia/libav/files/patch-common.mak
+++ /dev/null
@@ -1,13 +0,0 @@
---- common.mak.orig	2016-05-25 00:36:32 UTC
-+++ common.mak
-@@ -28,8 +28,8 @@ PATH_LIBNAME = $(foreach NAME,$(1),lib$(
- DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
- 
- SRC_DIR    := $(SRC_PATH)/lib$(NAME)
--ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
--SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
-+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(LIBAV_ARCH)/*.h))
-+SKIPHEADERS += $(ARCH_HEADERS:%=$(LIBAV_ARCH)/%) $(SKIPHEADERS-)
- SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
- HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))
- checkheaders: $(HOBJS)
diff --git a/multimedia/libav/files/patch-configure b/multimedia/libav/files/patch-configure
index 4f9affa1d3c8..6daac586bbf3 100644
--- a/multimedia/libav/files/patch-configure
+++ b/multimedia/libav/files/patch-configure
@@ -19,15 +19,6 @@
      check_cflags -Qunused-arguments
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
-@@ -4644,7 +4644,7 @@ DOCDIR=\$(DESTDIR)$docdir
- MANDIR=\$(DESTDIR)$mandir
- SRC_PATH=$source_path
- CC_IDENT=$cc_ident
--ARCH=$arch
-+LIBAV_ARCH=$arch
- INTRINSICS=$intrinsics
- CC=$cc
- AS=$as
 @@ -4821,7 +4821,7 @@ pkgconfig_generate(){
      requires=${requires%, }
      enabled ${name#lib} || return 0
diff --git a/multimedia/libav/files/patch-libavcodec_Makefile b/multimedia/libav/files/patch-libavcodec_Makefile
deleted file mode 100644
index a9179d6f3e80..000000000000
--- a/multimedia/libav/files/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/Makefile.orig	2016-05-25 00:36:32 UTC
-+++ libavcodec/Makefile
-@@ -704,7 +704,7 @@ SKIPHEADERS                            +
-                                           aac_tablegen_decl.h           \
-                                           fft-internal.h                \
-                                           tableprint.h                  \
--                                          $(ARCH)/vp56_arith.h          \
-+                                          $(LIBAV_ARCH)/vp56_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index b5e3da33edc8..c68d49ab10dd 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 
 USES=		compiler:c11 gmake iconv ncurses tar:xz
+NOPRECIOUSMAKEVARS=	yes # ARCH
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index c2819e4fdeb4..ce11fa00a670 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -167,12 +167,3 @@
  
  CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
  
-@@ -8375,7 +8386,7 @@ TIMER = $_timer
- EXESUF      = $_exesuf
- EXESUFS_ALL = .exe
- 
--ARCH = $arch
-+MPLAYER_ARCH = $arch
- $(mak_enable "$arch_all"    "$arch"    ARCH)
- $(mak_enable "$subarch_all" "$subarch" ARCH)
- $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
diff --git a/multimedia/mplayer/files/patch-ffmpeg_Makefile b/multimedia/mplayer/files/patch-ffmpeg_Makefile
deleted file mode 100644
index e83418d6dd18..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/Makefile.orig	2015-06-19 20:44:35 UTC
-+++ ffmpeg/Makefile
-@@ -92,7 +92,7 @@ define DOSUBDIR
- $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
- SUBDIR := $(1)/
- include $(SRC_PATH)/$(1)/Makefile
---include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-+-include $(SRC_PATH)/$(1)/$(MPLAYER_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
deleted file mode 100644
index 838d380df25b..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/libavcodec/Makefile.orig	2016-02-16 20:31:33 UTC
-+++ ffmpeg/libavcodec/Makefile
-@@ -935,7 +935,7 @@ SKIPHEADERS                            +
-                                           aaccoder_trellis.h            \
-                                           aacenc_quantization.h         \
-                                           aacenc_quantization_misc.h    \
--                                          $(ARCH)/vp56_arith.h          \
-+                                          $(MPLAYER_ARCH)/vp56_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
diff --git a/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile b/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
deleted file mode 100644
index 8df33e613da6..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- ffmpeg/tests/checkasm/Makefile.orig	2016-04-09 14:32:47 UTC
-+++ ffmpeg/tests/checkasm/Makefile
-@@ -20,7 +20,7 @@ AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += v
- CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
- 
- 
---include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
-+-include $(SRC_PATH)/tests/checkasm/$(MPLAYER_ARCH)/Makefile
- 
- CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
- CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
-@@ -43,6 +43,6 @@ checkasm: $(CHECKASM)
- testclean:: checkasmclean
- 
- checkasmclean:
--	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%)
-+	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(MPLAYER_ARCH)/%)
- 
- .PHONY: checkasm