Skip to content

Commit 01bb251

Browse files
committed
video/logo: do not generate unneeded logo C files
Currently, all the logo C files are generated irrespective of the CONFIG options. Adding them to extra-y is wrong. What we need to do here is to add them to 'targets' so that if_changed works properly. Files listed in 'targets' are cleaned, so clean-files is unneeded. Signed-off-by: Masahiro Yamada <[email protected]>
1 parent a9bbe79 commit 01bb251

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

drivers/video/logo/Makefile

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,6 @@ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
1818

1919
# How to generate logo's
2020

21-
# Use logo-cfiles to retrieve list of .c files to be built
22-
logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \
23-
$(wildcard $(srctree)/$(src)/*$(1).$(2))))
24-
25-
26-
# Mono logos
27-
extra-y += $(call logo-cfiles,_mono,pbm)
28-
29-
# VGA16 logos
30-
extra-y += $(call logo-cfiles,_vga16,ppm)
31-
32-
# 224 Logos
33-
extra-y += $(call logo-cfiles,_clut224,ppm)
34-
35-
# Gray 256
36-
extra-y += $(call logo-cfiles,_gray256,pgm)
37-
3821
pnmtologo := scripts/pnmtologo
3922

4023
# Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
@@ -55,5 +38,5 @@ $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtologo) FORCE
5538
$(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE
5639
$(call if_changed,logo)
5740

58-
# Files generated that shall be removed upon make clean
59-
clean-files := *_mono.c *_vga16.c *_clut224.c *_gray256.c
41+
# generated C files
42+
targets += *_mono.c *_vga16.c *_clut224.c *_gray256.c

0 commit comments

Comments
 (0)