This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 2c3c2edcb Makefile: Remove INCDIROPT
2c3c2edcb is described below
commit 2c3c2edcb71bc63e6bde8f9bd748996d3d511226
Author: yinshengkai <yinsheng...@xiaomi.com>
AuthorDate: Tue Oct 25 00:03:52 2022 +0800
Makefile: Remove INCDIROPT
This option, which resolves to -w when CONFIG_CYGWIN_WINTOOL is
configured, is now appended to INCDIR in tools/Config.mk.
See git commit # 5eae32577e5d5226e5d3027c169eeb369f83f77d in the main
---
boot/mcuboot/Make.defs | 8 ++++----
boot/mcuboot/Makefile | 4 ++--
canutils/lely-canopen/Make.defs | 4 ++--
crypto/libtomcrypt/Make.defs | 4 ++--
crypto/mbedtls/Make.defs | 4 ++--
crypto/tinycrypt/Make.defs | 4 ++--
gpsutils/minmea/Make.defs | 2 +-
graphics/libjpeg/Make.defs | 4 ++--
graphics/lvgl/Make.defs | 8 ++++----
interpreters/duktape/Make.defs | 4 ++--
interpreters/lua/Make.defs | 4 ++--
interpreters/quickjs/Make.defs | 4 ++--
interpreters/wamr/Make.defs | 4 ++--
interpreters/wasm3/Make.defs | 4 ++--
math/libtommath/Make.defs | 4 ++--
mlearning/cmsis/Make.defs | 4 ++--
mlearning/cmsis/libcmsisdsp/Make.defs | 4 ++--
mlearning/cmsis/libcmsisdsp/Makefile | 4 ++--
mlearning/cmsis/libcmsisnn/Make.defs | 4 ++--
mlearning/darknet/Make.defs | 4 ++--
mlearning/libnnablart/Make.defs | 4 ++--
netutils/cwebsocket/Make.defs | 4 ++--
netutils/mqttc/Make.defs | 4 ++--
system/argtable3/Make.defs | 4 ++--
system/libuv/Make.defs | 4 ++--
system/uorb/Make.defs | 4 ++--
26 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/boot/mcuboot/Make.defs b/boot/mcuboot/Make.defs
index d9e3960dd..8b4ae5ff1 100644
--- a/boot/mcuboot/Make.defs
+++ b/boot/mcuboot/Make.defs
@@ -23,12 +23,12 @@ CONFIGURED_APPS += $(APPDIR)/boot/mcuboot
# It allows import of NuttX implementation headers for MCUboot interfaces.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include}
# It allows import of MCUboot's bootutil library headers.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
endif
diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile
index dc5042304..f60b0fc81 100644
--- a/boot/mcuboot/Makefile
+++ b/boot/mcuboot/Makefile
@@ -72,8 +72,8 @@ CSRCS +=
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/aes_encrypt.c \
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/sha256.c \
$(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/utils.c
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
mcuboot/ext/tinycrypt/lib/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
mcuboot/ext/tinycrypt/lib/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)" mcuboot/ext/tinycrypt/lib/include}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" mcuboot/ext/tinycrypt/lib/include}
endif
$(MCUBOOT_TARBALL):
diff --git a/canutils/lely-canopen/Make.defs b/canutils/lely-canopen/Make.defs
index 8a8b86d08..05dcb5161 100644
--- a/canutils/lely-canopen/Make.defs
+++ b/canutils/lely-canopen/Make.defs
@@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/canutils/lely-canopen
# It allows `<lely/xxx.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/canutils/lely-canopen/lely-core/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/canutils/lely-canopen/lely-core/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/canutils/lely-canopen/lely-core/include}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/canutils/lely-canopen/lely-core/include}
endif
diff --git a/crypto/libtomcrypt/Make.defs b/crypto/libtomcrypt/Make.defs
index 99701cfdb..258c9d744 100644
--- a/crypto/libtomcrypt/Make.defs
+++ b/crypto/libtomcrypt/Make.defs
@@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/crypto/libtomcrypt
# It allows `<tomcrypt.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
endif
diff --git a/crypto/mbedtls/Make.defs b/crypto/mbedtls/Make.defs
index 9ee9beeb1..ee7f7d736 100644
--- a/crypto/mbedtls/Make.defs
+++ b/crypto/mbedtls/Make.defs
@@ -23,8 +23,8 @@ CONFIGURED_APPS += $(APPDIR)/crypto/mbedtls
# Allows `<mbedtls/<>.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/crypto/mbedtls/mbedtls/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/crypto/mbedtls/mbedtls/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/mbedtls/mbedtls/include}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(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>"'}
diff --git a/crypto/tinycrypt/Make.defs b/crypto/tinycrypt/Make.defs
index 3650f6e1b..8a898b399 100644
--- a/crypto/tinycrypt/Make.defs
+++ b/crypto/tinycrypt/Make.defs
@@ -20,6 +20,6 @@
ifneq ($(CONFIG_TINYCRYPT),)
CONFIGURED_APPS += $(APPDIR)/crypto/tinycrypt
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include}
endif
diff --git a/gpsutils/minmea/Make.defs b/gpsutils/minmea/Make.defs
index 01274a871..e62f10703 100644
--- a/gpsutils/minmea/Make.defs
+++ b/gpsutils/minmea/Make.defs
@@ -20,6 +20,6 @@
ifneq ($(CONFIG_GPSUTILS_MINMEA_LIB),)
CONFIGURED_APPS += $(APPDIR)/gpsutils/minmea
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/gpsutils/minmea}
endif
diff --git a/graphics/libjpeg/Make.defs b/graphics/libjpeg/Make.defs
index fa4bbf811..717a2e047 100644
--- a/graphics/libjpeg/Make.defs
+++ b/graphics/libjpeg/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_LIBJPEG),)
CONFIGURED_APPS += $(APPDIR)/graphics/libjpeg
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/graphics/libjpeg/libjpeg}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/graphics/libjpeg/libjpeg}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/libjpeg/libjpeg}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/libjpeg/libjpeg}
endif
diff --git a/graphics/lvgl/Make.defs b/graphics/lvgl/Make.defs
index f6d8e2297..5d289b063 100644
--- a/graphics/lvgl/Make.defs
+++ b/graphics/lvgl/Make.defs
@@ -23,11 +23,11 @@ CONFIGURED_APPS += $(APPDIR)/graphics/lvgl
# It allows `<lvgl/lvgl.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/lvgl}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/lvgl}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl}
# It allows `<lvgl.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/lvgl/lvgl}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/graphics/lvgl/lvgl}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl/lvgl}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl/lvgl}
endif
diff --git a/interpreters/duktape/Make.defs b/interpreters/duktape/Make.defs
index 5c2b45f8f..405b4516c 100644
--- a/interpreters/duktape/Make.defs
+++ b/interpreters/duktape/Make.defs
@@ -22,9 +22,9 @@ ifneq ($(CONFIG_INTERPRETERS_DUKTAPE),)
CONFIGURED_APPS += $(APPDIR)/interpreters/duktape
# It allows `<duktape/duktape.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/duktape/duktape/src-noline}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/duktape/duktape/src-noline}
endif
diff --git a/interpreters/lua/Make.defs b/interpreters/lua/Make.defs
index bbdf382ea..0ab12140c 100644
--- a/interpreters/lua/Make.defs
+++ b/interpreters/lua/Make.defs
@@ -23,9 +23,9 @@ CONFIGURED_APPS += $(APPDIR)/interpreters/lua
# Enable <lua.h> and <lauxlib.h> includes.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/lua/lua-$(CONFIG_INTERPRETER_LUA_VERSION)/src}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/lua/lua-$(CONFIG_INTERPRETER_LUA_VERSION)/src}
endif
diff --git a/interpreters/quickjs/Make.defs b/interpreters/quickjs/Make.defs
index c12bef231..c0f9a7da6 100644
--- a/interpreters/quickjs/Make.defs
+++ b/interpreters/quickjs/Make.defs
@@ -22,9 +22,9 @@ ifneq ($(CONFIG_INTERPRETERS_QUICKJS),)
CONFIGURED_APPS += $(APPDIR)/interpreters/quickjs
# It allows `<quickjs/quickjs.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/quickjs}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/quickjs}
endif
diff --git a/interpreters/wamr/Make.defs b/interpreters/wamr/Make.defs
index 020696af7..c09e5d2cb 100644
--- a/interpreters/wamr/Make.defs
+++ b/interpreters/wamr/Make.defs
@@ -21,9 +21,9 @@
ifneq ($(CONFIG_INTERPRETERS_WAMR),)
CONFIGURED_APPS += $(APPDIR)/interpreters/wamr
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wamr/wamr/core/iwasm/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wamr/wamr/core/iwasm/include}
endif
diff --git a/interpreters/wasm3/Make.defs b/interpreters/wasm3/Make.defs
index 4d4802c8d..a9c7c3c04 100644
--- a/interpreters/wasm3/Make.defs
+++ b/interpreters/wasm3/Make.defs
@@ -21,9 +21,9 @@
ifneq ($(CONFIG_INTERPRETERS_WASM3),)
CONFIGURED_APPS += $(APPDIR)/interpreters/wasm3
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wasm3/wasm3/source}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wasm3/wasm3/source}
endif
diff --git a/math/libtommath/Make.defs b/math/libtommath/Make.defs
index 250e09405..2fc71d5ae 100644
--- a/math/libtommath/Make.defs
+++ b/math/libtommath/Make.defs
@@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/math/libtommath
# It allows `<tommath.h>` import.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/math/libtommath/libtommath}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/math/libtommath/libtommath}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/math/libtommath/libtommath}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/math/libtommath/libtommath}
endif
diff --git a/mlearning/cmsis/Make.defs b/mlearning/cmsis/Make.defs
index 1a726c60e..3ec875379 100644
--- a/mlearning/cmsis/Make.defs
+++ b/mlearning/cmsis/Make.defs
@@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/mlearning/cmsis
include $(wildcard $(APPDIR)/mlearning/cmsis/*/Make.defs)
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/}
endif
diff --git a/mlearning/cmsis/libcmsisdsp/Make.defs
b/mlearning/cmsis/libcmsisdsp/Make.defs
index d181b64d6..efafee7d1 100644
--- a/mlearning/cmsis/libcmsisdsp/Make.defs
+++ b/mlearning/cmsis/libcmsisdsp/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_CMSIS_DSP),)
CONFIGURED_APPS += $(APPDIR)/mlearning/cmsis/libcmsisdsp
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/}
endif
diff --git a/mlearning/cmsis/libcmsisdsp/Makefile
b/mlearning/cmsis/libcmsisdsp/Makefile
index ca8e392d4..d6ec0c813 100644
--- a/mlearning/cmsis/libcmsisdsp/Makefile
+++ b/mlearning/cmsis/libcmsisdsp/Makefile
@@ -31,8 +31,8 @@ CFLAGS += -D__FPU_PRESENT=1U
CXXFLAGS += -D__FPU_PRESENT=1U
endif
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/}
CMSIS5_DSP := ../CMSIS_5/CMSIS/DSP/Source
CSRCS += SVMFunctions.c
diff --git a/mlearning/cmsis/libcmsisnn/Make.defs
b/mlearning/cmsis/libcmsisnn/Make.defs
index 11e84aa78..5953c5a94 100644
--- a/mlearning/cmsis/libcmsisnn/Make.defs
+++ b/mlearning/cmsis/libcmsisnn/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_CMSIS_NN),)
CONFIGURED_APPS += $(APPDIR)/mlearning/cmsis/libcmsisnn
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/}
endif
diff --git a/mlearning/darknet/Make.defs b/mlearning/darknet/Make.defs
index 9123d5bcf..0e95563bd 100644
--- a/mlearning/darknet/Make.defs
+++ b/mlearning/darknet/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_DARKNET_YOLO),)
CONFIGURED_APPS += $(APPDIR)/mlearning/darknet
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/darknet/darknet/include/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/darknet/darknet/include/}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/darknet/darknet/include/}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/darknet/darknet/include/}
endif
diff --git a/mlearning/libnnablart/Make.defs b/mlearning/libnnablart/Make.defs
index 8805b6e61..b4979b7ac 100644
--- a/mlearning/libnnablart/Make.defs
+++ b/mlearning/libnnablart/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_NNABLA_RT),)
CONFIGURED_APPS += $(APPDIR)/mlearning/libnnablart
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
$(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/}
endif
diff --git a/netutils/cwebsocket/Make.defs b/netutils/cwebsocket/Make.defs
index ca3e48e89..0c421cd37 100644
--- a/netutils/cwebsocket/Make.defs
+++ b/netutils/cwebsocket/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_CWEBSOCKET),)
CONFIGURED_APPS += $(APPDIR)/netutils/cwebsocket
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/netutils/cwebsocket/cwebsocket}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
$(APPDIR)/netutils/cwebsocket/cwebsocket}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/netutils/cwebsocket/cwebsocket}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/netutils/cwebsocket/cwebsocket}
endif
diff --git a/netutils/mqttc/Make.defs b/netutils/mqttc/Make.defs
index 7dbeb0035..b3401b7cb 100644
--- a/netutils/mqttc/Make.defs
+++ b/netutils/mqttc/Make.defs
@@ -21,9 +21,9 @@
ifneq ($(CONFIG_NETUTILS_MQTTC),)
CONFIGURED_APPS += $(APPDIR)/netutils/mqttc
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/netutils/mqttc/MQTT-C/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/netutils/mqttc/MQTT-C/include}
ifneq ($(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS),)
diff --git a/system/argtable3/Make.defs b/system/argtable3/Make.defs
index a8e07eb9f..524feef89 100644
--- a/system/argtable3/Make.defs
+++ b/system/argtable3/Make.defs
@@ -21,6 +21,6 @@
ifneq ($(CONFIG_SYSTEM_ARGTABLE3),)
CONFIGURED_APPS += $(APPDIR)/system/argtable3
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
"$(APPDIR)/system/argtable3/argtable3/src"}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)"
"$(APPDIR)/system/argtable3/argtable3/src"}
+CFLAGS += ${shell $(INCDIR) "$(CC)"
"$(APPDIR)/system/argtable3/argtable3/src"}
+CXXFLAGS += ${shell $(INCDIR) "$(CC)"
"$(APPDIR)/system/argtable3/argtable3/src"}
endif
diff --git a/system/libuv/Make.defs b/system/libuv/Make.defs
index f5406cb53..77ecc7fee 100644
--- a/system/libuv/Make.defs
+++ b/system/libuv/Make.defs
@@ -23,9 +23,9 @@ CONFIGURED_APPS += $(APPDIR)/system/libuv
# Enable <uv.h> include.
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/libuv/libuv/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/libuv/libuv/include}
endif
diff --git a/system/uorb/Make.defs b/system/uorb/Make.defs
index ead9d224b..c80bbdf4a 100644
--- a/system/uorb/Make.defs
+++ b/system/uorb/Make.defs
@@ -20,8 +20,8 @@
ifneq ($(CONFIG_UORB),)
CONFIGURED_APPS += $(APPDIR)/system/uorb
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/uorb/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/uorb/}
endif
