Makefile: replace INCDIR to INCDIR_PREFIX

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2022-11-08 18:39:52 +08:00 committed by Xiang Xiao
parent dbc757d79d
commit ee4d8b738f
54 changed files with 89 additions and 104 deletions

View File

@ -96,7 +96,7 @@ endef
# Standard include path
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)include"
CXXFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)include"
NUTTXLIB ?= $(call CONVERT_PATH,$(TOPDIR)$(DELIM)staging)

View File

@ -23,12 +23,12 @@ CONFIGURED_APPS += $(APPDIR)/boot/mcuboot
# It allows import of NuttX implementation headers for MCUboot interfaces.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/boot/mcuboot/mcuboot/boot/nuttx/include
# It allows import of MCUboot's bootutil library headers.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/boot/mcuboot/mcuboot/boot/bootutil/include
endif

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) "$(CC)" mcuboot/ext/tinycrypt/lib/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" mcuboot/ext/tinycrypt/lib/include}
CFLAGS += ${INCDIR_PREFIX}mcuboot/ext/tinycrypt/lib/include
CXXFLAGS += ${INCDIR_PREFIX}mcuboot/ext/tinycrypt/lib/include
endif
$(MCUBOOT_TARBALL):

View File

@ -28,7 +28,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_CANUTILS_CANDUMP_STACKSIZE)
MODULE = $(CONFIG_CANUTILS_CANDUMP)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/canutils/libcanutils}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/canutils/libcanutils
MAINSRC = candump.c
include $(APPDIR)/Application.mk

View File

@ -28,7 +28,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_CANUTILS_CANSEND_STACKSIZE)
MODULE = $(CONFIG_CANUTILS_CANSEND)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/canutils/libcanutils}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/canutils/libcanutils
MAINSRC = cansend.c
include $(APPDIR)/Application.mk

View File

@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/canutils/lely-canopen
# It allows `<lely/xxx.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/canutils/lely-canopen/lely-core/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/canutils/lely-canopen/lely-core/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/canutils/lely-canopen/lely-core/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/canutils/lely-canopen/lely-core/include
endif

View File

@ -151,7 +151,7 @@ endif
# enable config.h
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/include/canutils/lely}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/include/canutils/lely
CFLAGS += -DHAVE_CONFIG_H=1
CFLAGS += -Wno-shadow -Wno-undef

View File

@ -33,7 +33,7 @@ LIBCANARDV0_DRVDIR = $(LIBCANARDV0_SRCDIR)$(DELIM)drivers$(DELIM)nuttx
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils
CFLAGS += -std=c99 -DCANARD_ASSERT=DEBUGASSERT
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
CFLAGS += ${INCDIR_PREFIX}$(APPS_INCDIR)
CSRCS = $(LIBCANARDV0_SRCDIR)$(DELIM)canard.c $(LIBCANARDV0_DRVDIR)$(DELIM)canard_nuttx.c

View File

@ -40,7 +40,7 @@ O1HEAP_DRVDIR = $(O1HEAP_SRCDIR)$(DELIM)o1heap
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils
CFLAGS += -std=c11 -DCANARD_ASSERT=DEBUGASSERT -DCANARD_DSDL_CONFIG_LITTLE_ENDIAN=1
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
CFLAGS += ${INCDIR_PREFIX}$(APPS_INCDIR)
CSRCS = $(LIBCANARDV1_DRVDIR)$(DELIM)canard.c $(LIBCANARDV1_DRVDIR)$(DELIM)canard_dsdl.c
CSRCS += $(O1HEAP_DRVDIR)$(DELIM)o1heap.c

View File

@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/crypto/libtomcrypt
# It allows `<tomcrypt.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers
endif

View File

@ -23,8 +23,8 @@ CONFIGURED_APPS += $(APPDIR)/crypto/mbedtls
# Allows `<mbedtls/<>.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/mbedtls/mbedtls/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/mbedtls/mbedtls/include}
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>"'}

View File

@ -20,6 +20,6 @@
ifneq ($(CONFIG_TINYCRYPT),)
CONFIGURED_APPS += $(APPDIR)/crypto/tinycrypt
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/tinycrypt/tinycrypt/lib/include
endif

View File

@ -37,7 +37,7 @@ AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
# Audio Example flags
CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(AUDIODIR)"}
CXXFLAGS += ${INCDIR_PREFIX}"$(AUDIODIR)"
CXXFLAGS += -D_POSIX
include $(APPDIR)/Application.mk

View File

@ -25,7 +25,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_EXAMPLES_LIBCANARDV0_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_LIBCANARDV0)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/include/canutils}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/include/canutils
MAINSRC = canard_main.c
include $(APPDIR)/Application.mk

View File

@ -25,7 +25,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = $(CONFIG_EXAMPLES_LIBCANARDV1_DAEMON_STACK_SIZE)
MODULE = $(CONFIG_EXAMPLES_LIBCANARDV1)
CFLAGS += -std=c11 ${shell $(INCDIR) "$(CC)" $(APPDIR)/include/canutils $(APPDIR)/include/o1heap}
CFLAGS += -std=c11 ${INCDIR_PREFIX}$(APPDIR)/include/canutils $(APPDIR)/include/o1heap
CSRCS = socketcan.c
MAINSRC = canard_main.c

View File

@ -23,7 +23,7 @@ include $(APPDIR)/Make.defs
# NuttX per-window frame buffer graphics example.
NXGLYPHS = $(APPDIR)$(DELIM)graphics$(DELIM)nxglyphs
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXGLYPHS)$(DELIM)include"}
CFLAGS += ${INCDIR_PREFIX}"$(NXGLYPHS)$(DELIM)include"
CSRCS = pwfb_events.c pwfb_motion.c
MAINSRC = pwfb_main.c

View File

@ -28,7 +28,7 @@ STACKSIZE = $(CONFIG_EXAMPLES_TCP_IPC_SERVER_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_TCP_IPC_SERVER)
# SERVIDOR Example
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/examples/server_tcp/lorawan}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/examples/server_tcp/lorawan
CSRCS = uart_lorawan_layer.c protocol.c
MAINSRC = tcp_ipc_server_main.c

View File

@ -20,6 +20,5 @@
ifneq ($(CONFIG_GPSUTILS_MINMEA_LIB),)
CONFIGURED_APPS += $(APPDIR)/gpsutils/minmea
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/gpsutils/minmea}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/gpsutils/minmea
endif

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_LIBJPEG),)
CONFIGURED_APPS += $(APPDIR)/graphics/libjpeg
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/libjpeg/libjpeg}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/libjpeg/libjpeg}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/libjpeg/libjpeg
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/libjpeg/libjpeg
endif

View File

@ -23,11 +23,11 @@ CONFIGURED_APPS += $(APPDIR)/graphics/lvgl
# It allows `<lvgl/lvgl.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/lvgl
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/lvgl
# It allows `<lvgl.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl/lvgl}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/lvgl/lvgl}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/lvgl/lvgl
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/lvgl/lvgl
endif

View File

@ -24,6 +24,6 @@ include $(APPDIR)/Make.defs
include pdcurses/Make.defs
include nuttx/Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/graphics/pdcurs34/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/pdcurs34/include
include $(APPDIR)/Application.mk

View File

@ -22,7 +22,7 @@ include $(APPDIR)/Make.defs
# Add path to cursor images to CXXFLAGS
CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)/graphics/nxglyphs/include"}
CXXFLAGS += ${INCDIR_PREFIX}"$(APPDIR)/graphics/nxglyphs/include"
# Twm4Nx built-in application info

View File

@ -27,10 +27,10 @@ include $(TOPDIR)/scripts/Make.defs
# Compiler
ARCHCRT0OBJ = $(call CONVERT_PATH,$(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT))
ARCHINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
ARCHINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)cxx}
ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include
ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)cxx
ARCHCFLAGS += -fno-common -pipe
ARCHCXXFLAGS += -fno-common -nostdinc++ -pipe

View File

@ -22,9 +22,7 @@ ifneq ($(CONFIG_INTERPRETERS_DUKTAPE),)
CONFIGURED_APPS += $(APPDIR)/interpreters/duktape
# It allows `<duktape/duktape.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/duktape/duktape/src-noline}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/duktape/duktape/src-noline}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/duktape/duktape/src-noline
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/duktape/duktape/src-noline
endif

View File

@ -30,7 +30,7 @@ include $(APPDIR)/Make.defs
# Include paths
CFLAGS += ${shell $(INCDIR) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src}
CFLAGS += ${INCDIR_PREFIX}$(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src
# Source Files

View File

@ -23,9 +23,9 @@ CONFIGURED_APPS += $(APPDIR)/interpreters/lua
# Enable <lua.h> and <lauxlib.h> includes.
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/lua/lua-$(CONFIG_INTERPRETER_LUA_VERSION)/src}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/lua/lua-$(CONFIG_INTERPRETER_LUA_VERSION)/src}
CFLAGS += ${INCDIR_PREFIX}\
$(APPDIR)/interpreters/lua/lua-$(CONFIG_INTERPRETER_LUA_VERSION)/src
CXXFLAGS += ${INCDIR_PREFIX}\
$(APPDIR)/interpreters/lua/lua-$(CONFIG_INTERPRETER_LUA_VERSION)/src
endif

View File

@ -22,9 +22,7 @@ ifneq ($(CONFIG_INTERPRETERS_QUICKJS),)
CONFIGURED_APPS += $(APPDIR)/interpreters/quickjs
# It allows `<quickjs/quickjs.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/quickjs}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/quickjs}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/quickjs
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/quickjs
endif

View File

@ -21,9 +21,7 @@
ifneq ($(CONFIG_INTERPRETERS_WAMR),)
CONFIGURED_APPS += $(APPDIR)/interpreters/wamr
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wamr/wamr/core/iwasm/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wamr/wamr/core/iwasm/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/wamr/wamr/core/iwasm/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/wamr/wamr/core/iwasm/include
endif

View File

@ -21,9 +21,7 @@
ifneq ($(CONFIG_INTERPRETERS_WASM3),)
CONFIGURED_APPS += $(APPDIR)/interpreters/wasm3
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wasm3/wasm3/source}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/interpreters/wasm3/wasm3/source}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/wasm3/wasm3/source
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/wasm3/wasm3/source
endif

View File

@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/math/libtommath
# It allows `<tommath.h>` import.
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/math/libtommath/libtommath}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/math/libtommath/libtommath}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/math/libtommath/libtommath
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/math/libtommath/libtommath
endif

View File

@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/mlearning/cmsis
include $(wildcard $(APPDIR)/mlearning/cmsis/*/Make.defs)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/Core/Include/
endif

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_CMSIS_DSP),)
CONFIGURED_APPS += $(APPDIR)/mlearning/cmsis/libcmsisdsp
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/Include/
endif

View File

@ -31,8 +31,8 @@ CFLAGS += -D__FPU_PRESENT=1U
CXXFLAGS += -D__FPU_PRESENT=1U
endif
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/DSP/PrivateInclude/
CMSIS5_DSP := ../CMSIS_5/CMSIS/DSP/Source
CSRCS += SVMFunctions.c

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_CMSIS_NN),)
CONFIGURED_APPS += $(APPDIR)/mlearning/cmsis/libcmsisnn
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/cmsis/CMSIS_5/CMSIS/NN/Include/
endif

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_DARKNET_YOLO),)
CONFIGURED_APPS += $(APPDIR)/mlearning/darknet
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/darknet/darknet/include/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/darknet/darknet/include/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/darknet/darknet/include/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/darknet/darknet/include/
endif

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_NNABLA_RT),)
CONFIGURED_APPS += $(APPDIR)/mlearning/libnnablart
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/mlearning/libnnablart/nnabla-c-runtime/include/
endif

View File

@ -24,6 +24,6 @@ CSRCS += mbascii.c
DEPPATH += --dep-path ascii
VPATH += :ascii
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/ascii}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/ascii
endif

View File

@ -31,4 +31,4 @@ endif
DEPPATH += --dep-path functions
VPATH += :functions
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/functions}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/functions

View File

@ -38,6 +38,6 @@ endif
DEPPATH += --dep-path rtu
VPATH += :rtu
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/rtu}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/rtu
endif

View File

@ -24,6 +24,6 @@ CSRCS += mbtcp.c
DEPPATH += --dep-path tcp
VPATH += :tcp
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/modbus/tcp}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/tcp
endif

View File

@ -40,7 +40,7 @@ CJSON_SRCDIR = $(CJSON_UNPACKNAME)
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)netutils
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
CFLAGS += ${INCDIR_PREFIX}$(APPS_INCDIR)
CFLAGS += -DCJSON_INCLUDE_CONFIG_H
CSRCS = $(CJSON_SRCDIR)$(DELIM)cJSON.c

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_CWEBSOCKET),)
CONFIGURED_APPS += $(APPDIR)/netutils/cwebsocket
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/netutils/cwebsocket/cwebsocket}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/netutils/cwebsocket/cwebsocket}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/cwebsocket/cwebsocket
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/cwebsocket/cwebsocket
endif

View File

@ -21,10 +21,8 @@
ifneq ($(CONFIG_NETUTILS_MQTTC),)
CONFIGURED_APPS += $(APPDIR)/netutils/mqttc
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/netutils/mqttc/MQTT-C/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/netutils/mqttc/MQTT-C/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/mqttc/MQTT-C/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/mqttc/MQTT-C/include
ifneq ($(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS),)
CFLAGS += -DMQTT_USE_MBEDTLS

View File

@ -38,7 +38,7 @@ endif
ifeq ($(CONFIG_THTTPD_BINFS),y)
CSRCS += phf.c redirect.c ssi.c
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)netutils$(DELIM)thttpd"}
CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)thttpd"
DEPPATHS += --dep-path cgi-src
VPATH += :cgi-src

View File

@ -20,7 +20,7 @@
include $(APPDIR)/Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)netutils$(DELIM)thttpd"}
CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)thttpd"
CGIBINDIR = $(APPDIR)/netutils/thttpd/cgi-bin
CLEANFILES = *.o redirect ssi phf

View File

@ -21,6 +21,6 @@
ifneq ($(CONFIG_SYSTEM_ARGTABLE3),)
CONFIGURED_APPS += $(APPDIR)/system/argtable3
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)/system/argtable3/argtable3/src"}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)/system/argtable3/argtable3/src"}
CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)/system/argtable3/argtable3/src"
CXXFLAGS += ${INCDIR_PREFIX}"$(APPDIR)/system/argtable3/argtable3/src"
endif

View File

@ -32,7 +32,7 @@ EMBEDLOG_EXT = tar.gz
EMBEDLOG_SOURCES = embedlog-$(EMBEDLOG_VERSION)
EMBEDLOG_TARBALL = $(EMBEDLOG_SOURCES).$(EMBEDLOG_EXT)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)$(DELIM)include$(DELIM)system}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)include$(DELIM)system
CSRCS = $(EMBEDLOG_SOURCES)/src/el-options.c \
$(EMBEDLOG_SOURCES)/src/el-perror.c \

View File

@ -31,7 +31,7 @@ CSRCS = bfile.c cmdargs.c hexcopy.c hexdump.c hexenter.c hexhelp.c
CSRCS += hexinsert.c hexmove.c hexremove.c hexword.c
MAINSRC = hexed.c
CFLAGS += ${shell $(INCDIR) "$(CC)" include}
CFLAGS += ${INCDIR_PREFIX}include
VPATH += :src
DEPPATH += --dep-path src

View File

@ -23,9 +23,7 @@ CONFIGURED_APPS += $(APPDIR)/system/libuv
# Enable <uv.h> include.
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/libuv/libuv/include}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/libuv/libuv/include}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/libuv/libuv/include
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/libuv/libuv/include
endif

View File

@ -32,8 +32,8 @@ PSMQ_EXT = tar.gz
PSMQ_SOURCES = psmq-$(PSMQ_VERSION)
PSMQ_TARBALL = $(PSMQ_SOURCES).$(PSMQ_EXT)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)$(DELIM)include$(DELIM)system}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)$(DELIM)system$(DELIM)psmq$(DELIM)$(PSMQ_SOURCES)}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)include$(DELIM)system
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)system$(DELIM)psmq$(DELIM)$(PSMQ_SOURCES)
# mandatory source files to compile
CSRCS = $(PSMQ_SOURCES)/lib/psmq.c \

View File

@ -20,8 +20,6 @@
ifneq ($(CONFIG_UORB),)
CONFIGURED_APPS += $(APPDIR)/system/uorb
CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/uorb/}
CXXFLAGS += ${shell $(INCDIR) "$(CC)" \
$(APPDIR)/system/uorb/}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/uorb/
CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/uorb/
endif

View File

@ -40,7 +40,7 @@ UNITY_SRCDIR = $(UNITY_UNPACKNAME)$(DELIM)src
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)testing
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
CFLAGS += ${INCDIR_PREFIX}$(APPS_INCDIR)
CFLAGS += -DUNITY_INCLUDE_CONFIG_H
CSRCS = $(UNITY_SRCDIR)$(DELIM)unity.c

View File

@ -24,6 +24,6 @@ MAINSRC = iwpan.c
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/wireless/iwpan/src}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/wireless/iwpan/src
endif

View File

@ -28,6 +28,6 @@ endif
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/wireless/wapi/src}
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/wireless/wapi/src
endif