sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: Remove INCDIROPT

Browse Source 
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
This commit is contained in:
yinshengkai 2022-10-25 00:03:52 +08:00 committed by Xiang Xiao
parent ffab06c6c5
commit 2c3c2edcb7
26 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/mcuboot/Make.defs
View File

@ -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

4
boot/mcuboot/Makefile
View File

@ -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):

4
canutils/lely-canopen/Make.defs
View File

@ -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

4
crypto/libtomcrypt/Make.defs
View File

@ -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

4
crypto/mbedtls/Make.defs
View File

@ -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>"'}

4
crypto/tinycrypt/Make.defs
View File

@ -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

2
gpsutils/minmea/Make.defs
View File

@ -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

4
graphics/libjpeg/Make.defs
View File

@ -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

8
graphics/lvgl/Make.defs
View File

@ -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

4
interpreters/duktape/Make.defs
View File

@ -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

4
interpreters/lua/Make.defs
View File

@ -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

4
interpreters/quickjs/Make.defs
View File

@ -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

4
interpreters/wamr/Make.defs
View File

@ -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

4
interpreters/wasm3/Make.defs
View File

@ -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

4
math/libtommath/Make.defs
View File

@ -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

4
mlearning/cmsis/Make.defs
View File

@ -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

4
mlearning/cmsis/libcmsisdsp/Make.defs
View File

@ -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

4
mlearning/cmsis/libcmsisdsp/Makefile
View File

@ -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

4
mlearning/cmsis/libcmsisnn/Make.defs
View File

@ -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

4
mlearning/darknet/Make.defs
View File

@ -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

4
mlearning/libnnablart/Make.defs
View File

@ -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

4
netutils/cwebsocket/Make.defs
View File

@ -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

4
netutils/mqttc/Make.defs
View File

@ -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),)

4
system/argtable3/Make.defs
View File

@ -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

4
system/libuv/Make.defs
View File

@ -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

4
system/uorb/Make.defs
View File

@ -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