History

avcodec/hevc/Makefile: Move rules for lavc/* files to lavc/Makefile

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.

Andreas Rheinhardt committed 2 years ago

Commit dd8fb0a1 parent daac1012 files · +4 −8Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files
  1. libavcodec/Makefile +4 −0
  2. libavcodec/hevc/Makefile +0 −8
libavcodec/Makefile+4−0
@@ -106,6 +106,9 @@ OBJS-$(CONFIG_H264PARSE) += h264_parse.o h264_ps.o h264data.o \ · 105 unmodified lines
106OBJS-$(CONFIG_H264PRED) += h264pred.o106OBJS-$(CONFIG_H264PRED) += h264pred.o
107OBJS-$(CONFIG_H264QPEL) += h264qpel.o107OBJS-$(CONFIG_H264QPEL) += h264qpel.o
108OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o108OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o
109OBJS-$(CONFIG_HEVCPARSE) += h2645data.o h2645_parse.o h2645_vui.o
110OBJS-$(CONFIG_HEVC_SEI) += h2645_sei.o aom_film_grain.o \
111 dynamic_hdr_vivid.o
109OBJS-$(CONFIG_HPELDSP) += hpeldsp.o112OBJS-$(CONFIG_HPELDSP) += hpeldsp.o
110OBJS-$(CONFIG_HUFFMAN) += huffman.o113OBJS-$(CONFIG_HUFFMAN) += huffman.o
111OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o114OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o
@@ -427,6 +430,7 @@ OBJS-$(CONFIG_HCA_DECODER) += hcadec.o · 315 unmodified lines
427OBJS-$(CONFIG_HCOM_DECODER) += hcom.o430OBJS-$(CONFIG_HCOM_DECODER) += hcom.o
428OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o431OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o
429OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o432OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o
433OBJS-$(CONFIG_HEVC_DECODER) += aom_film_grain.o h274.o
430OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o434OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o
431OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o435OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o
432OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o436OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o
libavcodec/hevc/Makefile+0−8
@@ -2,8 +2,6 @@ clean:: · 1 unmodified line
2 $(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%)2 $(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%)
3 3
4OBJS-$(CONFIG_HEVC_DECODER) += \4OBJS-$(CONFIG_HEVC_DECODER) += \
5 aom_film_grain.o \
6 h274.o \
7 hevc/cabac.o \5 hevc/cabac.o \
8 hevc/data.o \6 hevc/data.o \
9 hevc/dsp.o \7 hevc/dsp.o \
@@ -18,9 +16,6 @@ OBJS-$(CONFIG_HEVC_PARSER) += \ · 8 unmodified lines
18 16
19 17
20OBJS-$(CONFIG_HEVCPARSE) += \18OBJS-$(CONFIG_HEVCPARSE) += \
21 h2645data.o \
22 h2645_parse.o \
23 h2645_vui.o \
24 hevc/data.o \19 hevc/data.o \
25 hevc/parse.o \20 hevc/parse.o \
26 hevc/ps.o \21 hevc/ps.o \
@@ -28,9 +23,6 @@ OBJS-$(CONFIG_HEVCPARSE) += \ · 1 unmodified line
28 23
29OBJS-$(CONFIG_HEVC_SEI) += \24OBJS-$(CONFIG_HEVC_SEI) += \
30 hevc/sei.o \25 hevc/sei.o \
31 h2645_sei.o \
32 dynamic_hdr_vivid.o \
33 aom_film_grain.o \
34 26
35 27
36libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/28libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t