You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/04/29 04:28:27 UTC
[incubator-nuttx] 05/06: libnx/nxfonts: change the generated file
nxfonts_tom-thumb-4x6.c to nxfonts_bitmap_tom-thumb-4x6.c
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 23389215bb09b2997c2e29a39b635339c202bf3e
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Tue Apr 28 14:18:22 2020 +0800
libnx/nxfonts: change the generated file nxfonts_tom-thumb-4x6.c to nxfonts_bitmap_tom-thumb-4x6.c
Align the generated files name, so make distclean could also remove all nxfonts_bitmaps_*.c files, no
need to add one more extra DELFILE for nxfonts_tom-thumb-4x6.c.
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
libs/libnx/nxfonts/Make.defs | 2 +-
libs/libnx/nxfonts/Makefile.sources | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/libnx/nxfonts/Make.defs b/libs/libnx/nxfonts/Make.defs
index 538b938..733ae8c 100644
--- a/libs/libnx/nxfonts/Make.defs
+++ b/libs/libnx/nxfonts/Make.defs
@@ -228,7 +228,7 @@ endif
# Tom Thumb mono-space 4x6 font
ifeq ($(CONFIG_NXFONT_TOM_THUMB_4X6),y)
-CSRCS += nxfonts_tom-thumb-4x6.c
+CSRCS += nxfonts_bitmaps_tom-thumb-4x6.c
endif
# Add the nxfont/ directory to the build
diff --git a/libs/libnx/nxfonts/Makefile.sources b/libs/libnx/nxfonts/Makefile.sources
index de70f33..af3b58d 100644
--- a/libs/libnx/nxfonts/Makefile.sources
+++ b/libs/libnx/nxfonts/Makefile.sources
@@ -300,7 +300,7 @@ endif
ifeq ($(NXFONTS_FONTID),43)
NXFONTS_PREFIX := g_tom_thumb_4x6_
-GEN_CSRC = nxfonts_tom-thumb-4x6.c
+GEN_CSRC = nxfonts_bitmaps_tom-thumb-4x6.c
endif
DEPENDENCY := nxfonts_bitmaps.c