From c31d2326560087b80f8523b27060ad6388369cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 8 Mar 2024 10:05:32 +0200 Subject: [PATCH] libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This currently builds files in the libavcodec/x86/{vvc,h26x} subdirectories, which is somewhat unexpected when building for another architecture than x86. The regular arch subdirectories are handled with -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile in the toplevel Makefile. Switch this to a similar optional inclusion, using $(ARCH). Signed-off-by: Martin Storsjö --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5d99120aa9..708434ac76 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -64,7 +64,7 @@ OBJS = ac3_parser.o \ # subsystems include $(SRC_PATH)/libavcodec/vvc/Makefile -include $(SRC_PATH)/libavcodec/x86/vvc/Makefile +-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o ac3.o ac3tab.o OBJS-$(CONFIG_ADTS_HEADER) += adts_header.o mpeg4audio_sample_rates.o