diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2026-04-07 11:23:15 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2026-04-07 17:38:07 +0200 |
| commit | de0b375bce6df8be2123d15a026dc74ba54e5b2c (patch) | |
| tree | 789e3579f3eed43dddf38280763f983f809a535e /lib | |
| parent | 97df8960240afc47c2349d008b0993e7727bbda5 (diff) | |
| download | linux-de0b375bce6df8be2123d15a026dc74ba54e5b2c.tar.gz linux-de0b375bce6df8be2123d15a026dc74ba54e5b2c.zip | |
lib/fonts: Clean up Makefile
Simplify the Makefile. Drop font-obj-y and sort the fonts by dictionary
order. Done in preparation for supporting optional font rotation.
v2:
- sort Makefile font entries by Family/Size in ascending order (Geert, Jiri)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fonts/Makefile | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/lib/fonts/Makefile b/lib/fonts/Makefile index 30a85a4292fa..b176af53d53e 100644 --- a/lib/fonts/Makefile +++ b/lib/fonts/Makefile @@ -1,23 +1,22 @@ # SPDX-License-Identifier: GPL-2.0 # Font handling -font-objs := fonts.o +font-y := fonts.o -font-objs-$(CONFIG_FONT_SUN8x16) += font_sun8x16.o -font-objs-$(CONFIG_FONT_SUN12x22) += font_sun12x22.o -font-objs-$(CONFIG_FONT_8x8) += font_8x8.o -font-objs-$(CONFIG_FONT_8x16) += font_8x16.o -font-objs-$(CONFIG_FONT_6x11) += font_6x11.o -font-objs-$(CONFIG_FONT_7x14) += font_7x14.o -font-objs-$(CONFIG_FONT_10x18) += font_10x18.o -font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o -font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o -font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o -font-objs-$(CONFIG_FONT_6x10) += font_6x10.o -font-objs-$(CONFIG_FONT_TER10x18) += font_ter10x18.o -font-objs-$(CONFIG_FONT_TER16x32) += font_ter16x32.o -font-objs-$(CONFIG_FONT_6x8) += font_6x8.o +# Built-in fonts; sorted by Family-Size in ascending order +font-$(CONFIG_FONT_6x8) += font_6x8.o +font-$(CONFIG_FONT_6x10) += font_6x10.o +font-$(CONFIG_FONT_6x11) += font_6x11.o +font-$(CONFIG_FONT_7x14) += font_7x14.o +font-$(CONFIG_FONT_8x8) += font_8x8.o +font-$(CONFIG_FONT_8x16) += font_8x16.o +font-$(CONFIG_FONT_10x18) += font_10x18.o +font-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o +font-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o +font-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o +font-$(CONFIG_FONT_SUN8x16) += font_sun8x16.o +font-$(CONFIG_FONT_SUN12x22) += font_sun12x22.o +font-$(CONFIG_FONT_TER10x18) += font_ter10x18.o +font-$(CONFIG_FONT_TER16x32) += font_ter16x32.o -font-objs += $(font-objs-y) - -obj-$(CONFIG_FONT_SUPPORT) += font.o +obj-$(CONFIG_FONT_SUPPORT) += font.o |