From bd2efd9f513cb1409095d7de5e77b873eceefca0 Mon Sep 17 00:00:00 2001
From: yinshengkai <yinshengkai@xiaomi.com>
Date: Wed, 9 Nov 2022 23:00:20 +0800
Subject: [PATCH] tools: replace DEFINE to DEFINE_PREFIX

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
---
 Application.mk             | 4 ++--
 crypto/mbedtls/Make.defs   | 4 ++--
 crypto/mbedtls/Makefile    | 2 +-
 examples/lvgldemo/Makefile | 4 ++--
 system/argtable3/Makefile  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Application.mk b/Application.mk
index 37b6c82d5..9c631c027 100644
--- a/Application.mk
+++ b/Application.mk
@@ -199,8 +199,8 @@ $(MAINCXXOBJ): %$(CXXEXT)$(SUFFIX)$(OBJEXT): %$(CXXEXT)
 		$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))
 
 $(MAINCOBJ): %.c$(SUFFIX)$(OBJEXT): %.c
-	$(eval $<_CFLAGS += ${shell $(DEFINE) "$(CC)" main=$(firstword $(MAINNAME))})
-	$(eval $<_CELFFLAGS += ${shell $(DEFINE) "$(CC)" main=$(firstword $(MAINNAME))})
+	$(eval $<_CFLAGS += ${DEFINE_PREFIX}main=$(firstword $(MAINNAME)))
+	$(eval $<_CELFFLAGS += ${DEFINE_PREFIX}main=$(firstword $(MAINNAME)))
 	$(eval MAINNAME=$(filter-out $(firstword $(MAINNAME)),$(MAINNAME)))
 	$(if $(and $(CONFIG_BUILD_LOADABLE),$(CELFFLAGS)), \
 		$(call ELFCOMPILE, $<, $@), $(call COMPILE, $<, $@))
diff --git a/crypto/mbedtls/Make.defs b/crypto/mbedtls/Make.defs
index 7e0e5178b..0c3f35253 100644
--- a/crypto/mbedtls/Make.defs
+++ b/crypto/mbedtls/Make.defs
@@ -26,7 +26,7 @@ CONFIGURED_APPS += $(APPDIR)/crypto/mbedtls
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/mbedtls/mbedtls/include
 CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/mbedtls/mbedtls/include
 
-CFLAGS += ${shell $(DEFINE) "$(CC)" MBEDTLS_CONFIG_FILE='"<crypto/mbedtls_config.h>"'}
-CXXFLAGS += ${shell $(DEFINE) "$(CC)" MBEDTLS_CONFIG_FILE='"<crypto/mbedtls_config.h>"'}
+CFLAGS += ${DEFINE_PREFIX}MBEDTLS_CONFIG_FILE="<crypto/mbedtls_config.h>"
+CXXFLAGS += ${DEFINE_PREFIX}MBEDTLS_CONFIG_FILE="<crypto/mbedtls_config.h>"
 
 endif
diff --git a/crypto/mbedtls/Makefile b/crypto/mbedtls/Makefile
index 65a108b01..1b9245f99 100644
--- a/crypto/mbedtls/Makefile
+++ b/crypto/mbedtls/Makefile
@@ -36,7 +36,7 @@ MBEDTLS_UNPACKLIBDIR = $(MBEDTLS_UNPACKNAME)$(DELIM)library
 MBEDTLS_UNPACKPROGDIR = $(MBEDTLS_UNPACKNAME)$(DELIM)programs
 
 # This lets Mbed TLS better use some of the POSIX features we have
-CFLAGS += ${shell $(DEFINE) "$(CC)" __unix__}
+CFLAGS += ${DEFINE_PREFIX}__unix__
 
 CSRCS = $(wildcard $(MBEDTLS_UNPACKLIBDIR)$(DELIM)*.c)
 
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index a81e3ef5c..9a903a468 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -74,8 +74,8 @@ endif
 
 MAINSRC = lvgldemo.c
 
-CFLAGS += ${shell $(DEFINE) "$(CC)" LV_LVGL_H_INCLUDE_SIMPLE} -Wno-format
-CXXFLAGS += ${shell $(DEFINE) "$(CC)" LV_LVGL_H_INCLUDE_SIMPLE} -Wno-format
+CFLAGS += ${DEFINE_PREFIX}LV_LVGL_H_INCLUDE_SIMPLE -Wno-format
+CXXFLAGS += ${DEFINE_PREFIX}LV_LVGL_H_INCLUDE_SIMPLE -Wno-format
 
 $(LVGL_EXAMPLES_TARBALL):
 	$(Q) echo "Downloading: $(LVGL_EXAMPLES_TARBALL)"
diff --git a/system/argtable3/Makefile b/system/argtable3/Makefile
index aa0c613aa..307415381 100644
--- a/system/argtable3/Makefile
+++ b/system/argtable3/Makefile
@@ -28,7 +28,7 @@ ARGTABLE3_SRCDIR   = $(ARGTABLE3_UNPACK)$(DELIM)src
 DEPPATH += --dep-path $(ARGTABLE3_SRCDIR)
 VPATH   += :$(ARGTABLE3_SRCDIR)
 
-CFLAGS += ${shell $(DEFINE) "$(CC)" ARG_REPLACE_GETOPT=0}
+CFLAGS += ${DEFINE_PREFIX}ARG_REPLACE_GETOPT=0
 CSRCS := $(notdir $(wildcard $(ARGTABLE3_SRCDIR)$(DELIM)*.c))
 
 # workaround for clang.