| Message ID | 20240308083836.47422-2-martin@martin.st |
|---|---|
| State | Accepted |
| Commit | c31d2326560087b80f8523b27060ad6388369cac |
| Headers | show |
| Series | [FFmpeg-devel,1/2] makefile: Clean up missed object files with "make clean" | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Hi Martin, On Fri, Mar 8, 2024 at 3:38 AM Martin Storsjö <martin@martin.st> wrote: > > 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). > --- > 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 > -- This patch looks good to me. Thanks, Sean McGovern
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
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). --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)