[FFmpeg-devel] [PATCH 1/2] makefile: Clean up missed object files with "make clean"

[FFmpeg-devel] [PATCH 1/2] makefile: Clean up missed object files with "make clean"

[Martin Storsjö]

In some builds, the following object files could be left behind
after make clean:

./libavfilter/metal/utils.o
./libavfilter/metal/vf_yadif_videotoolbox.metallib.o
./libavcodec/x86/h26x/h2656dsp.o
./libavcodec/neon/mpegvideo.o
./ffbuild/bin2c_host.o
---
 ffbuild/common.mak          | 2 +-
 libavcodec/neon/Makefile    | 3 +++
 libavcodec/x86/vvc/Makefile | 2 +-
 libavfilter/Makefile        | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index ac54ac0681..87a3ffd2b0 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -140,7 +140,7 @@ else
 endif
 
 clean::
-	$(RM) $(BIN2CEXE)
+	$(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%)
 
 %.c %.h %.pc %.ver %.version: TAG = GEN
 
diff --git a/libavcodec/neon/Makefile b/libavcodec/neon/Makefile
index 607f116a77..83c2f0051c 100644
--- a/libavcodec/neon/Makefile
+++ b/libavcodec/neon/Makefile
@@ -1 +1,4 @@
+clean::
+	$(RM) $(CLEANSUFFIXES:%=libavcodec/neon/%)
+
 OBJS-$(CONFIG_MPEGVIDEO)          += neon/mpegvideo.o
diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile
index 82f281d1c7..d1623bd46a 100644
--- a/libavcodec/x86/vvc/Makefile
+++ b/libavcodec/x86/vvc/Makefile
@@ -1,5 +1,5 @@
 clean::
-	$(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%)
+	$(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) $(CLEANSUFFIXES:%=libavcodec/x86/h26x/%)
 
 OBJS-$(CONFIG_VVC_DECODER)             += x86/vvc/vvcdsp_init.o \
                                           x86/h26x/h2656dsp.o
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index f6c1d641d6..994d9773ba 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -666,6 +666,7 @@ TOOLS-$(CONFIG_LIBZMQ) += zmqsend
 
 clean::
 	$(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) \
+              $(CLEANSUFFIXES:%=libavfilter/metal/%) \
               $(CLEANSUFFIXES:%=libavfilter/vulkan/%)
 
 OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl))
-- 
2.39.3 (Apple Git-145)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture

[Martin Storsjö]

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
-- 
2.39.3 (Apple Git-145)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/2] libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture

[Sean McGovern]

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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] makefile: Clean up missed object files with "make clean"

[Sean McGovern]

Hi,

On Fri, Mar 8, 2024 at 3:38 AM Martin Storsjö <martin@martin.st> wrote:
>
> In some builds, the following object files could be left behind
> after make clean:
>
> ./libavfilter/metal/utils.o
> ./libavfilter/metal/vf_yadif_videotoolbox.metallib.o
> ./libavcodec/x86/h26x/h2656dsp.o
> ./libavcodec/neon/mpegvideo.o
> ./ffbuild/bin2c_host.o
> ---
>  ffbuild/common.mak          | 2 +-
>  libavcodec/neon/Makefile    | 3 +++
>  libavcodec/x86/vvc/Makefile | 2 +-
>  libavfilter/Makefile        | 1 +
>  4 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/ffbuild/common.mak b/ffbuild/common.mak
> index ac54ac0681..87a3ffd2b0 100644
> --- a/ffbuild/common.mak
> +++ b/ffbuild/common.mak
> @@ -140,7 +140,7 @@ else
>  endif
>
>  clean::
> -       $(RM) $(BIN2CEXE)
> +       $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%)
>
>  %.c %.h %.pc %.ver %.version: TAG = GEN
>
> diff --git a/libavcodec/neon/Makefile b/libavcodec/neon/Makefile
> index 607f116a77..83c2f0051c 100644
> --- a/libavcodec/neon/Makefile
> +++ b/libavcodec/neon/Makefile
> @@ -1 +1,4 @@
> +clean::
> +       $(RM) $(CLEANSUFFIXES:%=libavcodec/neon/%)
> +
>  OBJS-$(CONFIG_MPEGVIDEO)          += neon/mpegvideo.o
> diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile
> index 82f281d1c7..d1623bd46a 100644
> --- a/libavcodec/x86/vvc/Makefile
> +++ b/libavcodec/x86/vvc/Makefile
> @@ -1,5 +1,5 @@
>  clean::
> -       $(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%)
> +       $(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) $(CLEANSUFFIXES:%=libavcodec/x86/h26x/%)
>
>  OBJS-$(CONFIG_VVC_DECODER)             += x86/vvc/vvcdsp_init.o \
>                                            x86/h26x/h2656dsp.o
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index f6c1d641d6..994d9773ba 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -666,6 +666,7 @@ TOOLS-$(CONFIG_LIBZMQ) += zmqsend
>
>  clean::
>         $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) \
> +              $(CLEANSUFFIXES:%=libavfilter/metal/%) \
>                $(CLEANSUFFIXES:%=libavfilter/vulkan/%)
>
>  OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl))
> --

This also looks good to me, and closes Trac #10895.

Thanks,

Sean McGovern
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".