[FFmpeg-devel] [PATCH 1/7] avcodec/hevc/Makefile: Move rules for lavc/* files to lavc/Makefile

[Andreas Rheinhardt]

Andreas Rheinhardt:
> If any of these files (say A) would be changed in such a way
> that A acquires a new dependency on another file B, building B
> would need to be added to all the rules that lead to A being built.
> Yet currently the rules for several files are spread over
> the lavc Makefile and the Makefile of the lavc/hevc subdir, making
> it more likely to be forgotten. So move the rules for these files
> to the lavc/Makefile.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/Makefile      | 4 ++++
>  libavcodec/hevc/Makefile | 8 --------
>  2 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 8ab4398b6c..1a44352906 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -106,6 +106,9 @@ OBJS-$(CONFIG_H264PARSE)               += h264_parse.o h264_ps.o h264data.o \
>  OBJS-$(CONFIG_H264PRED)                += h264pred.o
>  OBJS-$(CONFIG_H264QPEL)                += h264qpel.o
>  OBJS-$(CONFIG_H264_SEI)                += h264_sei.o h2645_sei.o
> +OBJS-$(CONFIG_HEVCPARSE)               += h2645data.o h2645_parse.o h2645_vui.o
> +OBJS-$(CONFIG_HEVC_SEI)                += h2645_sei.o aom_film_grain.o \
> +                                          dynamic_hdr_vivid.o
>  OBJS-$(CONFIG_HPELDSP)                 += hpeldsp.o
>  OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
>  OBJS-$(CONFIG_HUFFYUVDSP)              += huffyuvdsp.o
> @@ -427,6 +430,7 @@ OBJS-$(CONFIG_HCA_DECODER)             += hcadec.o
>  OBJS-$(CONFIG_HCOM_DECODER)            += hcom.o
>  OBJS-$(CONFIG_HDR_DECODER)             += hdrdec.o
>  OBJS-$(CONFIG_HDR_ENCODER)             += hdrenc.o
> +OBJS-$(CONFIG_HEVC_DECODER)            += aom_film_grain.o h274.o
>  OBJS-$(CONFIG_HEVC_AMF_ENCODER)        += amfenc_hevc.o
>  OBJS-$(CONFIG_HEVC_CUVID_DECODER)      += cuviddec.o
>  OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o
> diff --git a/libavcodec/hevc/Makefile b/libavcodec/hevc/Makefile
> index 9c385ef3da..93ed4213f6 100644
> --- a/libavcodec/hevc/Makefile
> +++ b/libavcodec/hevc/Makefile
> @@ -2,8 +2,6 @@ clean::
>  	$(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%)
>  
>  OBJS-$(CONFIG_HEVC_DECODER) += \
> -    aom_film_grain.o           \
> -    h274.o                     \
>      hevc/cabac.o               \
>      hevc/data.o                \
>      hevc/dsp.o                 \
> @@ -18,9 +16,6 @@ OBJS-$(CONFIG_HEVC_PARSER) += \
>  
>  
>  OBJS-$(CONFIG_HEVCPARSE) += \
> -    h2645data.o             \
> -    h2645_parse.o           \
> -    h2645_vui.o             \
>      hevc/data.o             \
>      hevc/parse.o            \
>      hevc/ps.o               \
> @@ -28,9 +23,6 @@ OBJS-$(CONFIG_HEVCPARSE) += \
>  
>  OBJS-$(CONFIG_HEVC_SEI) +=  \
>      hevc/sei.o              \
> -    h2645_sei.o             \
> -    dynamic_hdr_vivid.o     \
> -    aom_film_grain.o        \
>  
>  
>  libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/

Will apply patches 1-7 tomorrow unless there are objections.

- Andreas