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

tools: replace INCDIR to Makefile variable

Browse Source 
In the past, header file paths were generated by the incdir command
Now they are generated by concatenating environment variables

In this way, when executing makefile, no shell command will be executed,
it will improve the speed of executing makfile
Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2022-11-01 21:47:53 +08:00 committed by Xiang Xiao
parent 95d9abcf58
commit 85f727f232
79 changed files with 153 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/Makefile
View File

@ -37,10 +37,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

6
arch/arm64/src/Makefile
View File

@ -23,9 +23,9 @@ include chip/Make.defs
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/avr/src/Makefile
View File

@ -29,10 +29,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/hc/src/Makefile
View File

@ -30,10 +30,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/mips/src/Makefile
View File

@ -27,10 +27,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/misoc/src/Makefile
View File

@ -31,10 +31,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/or1k/src/Makefile
View File

@ -29,10 +29,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/renesas/src/Makefile
View File

@ -23,10 +23,10 @@ include chip/Make.defs
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

6
arch/risc-v/src/Makefile
View File

@ -32,9 +32,9 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

2
arch/risc-v/src/common/supervisor/Make.defs
View File

@ -24,5 +24,5 @@ CMN_ASRCS += riscv_syscall.S
CMN_CSRCS += riscv_perform_syscall.c CMN_CSRCS += riscv_perform_syscall.c
CMN_CSRCS += riscv_percpu.c riscv_sbi.c CMN_CSRCS += riscv_percpu.c riscv_sbi.c
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common$(DELIM)supervisor} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common$(DELIM)supervisor
VPATH += common$(DELIM)supervisor VPATH += common$(DELIM)supervisor

10
arch/sim/src/Makefile
View File

@ -22,9 +22,9 @@
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)
@ -88,8 +88,8 @@ HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
$(ARCHCFLAGS) $(HOSTINCLUDES) $(EXTRAFLAGS) -D__SIM__ -pipe \ $(ARCHCFLAGS) $(HOSTINCLUDES) $(EXTRAFLAGS) -D__SIM__ -pipe \
-fvisibility=default -fvisibility=default
HOSTCFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)} HOSTCFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)
HOSTCFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} HOSTCFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
ifeq ($(CONFIG_HOST_MACOS),y) ifeq ($(CONFIG_HOST_MACOS),y)
HOSTCFLAGS += -Wno-deprecated-declarations HOSTCFLAGS += -Wno-deprecated-declarations
endif endif

8
arch/x86/src/Makefile
View File

@ -27,10 +27,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/x86_64/src/Makefile
View File

@ -27,10 +27,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

8
arch/xtensa/src/Makefile
View File

@ -31,10 +31,10 @@ endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

6
arch/z16/src/Makefile
View File

@ -24,9 +24,9 @@ include chip/Make.defs
COMPILER = ${shell basename "$(CC)"} COMPILER = ${shell basename "$(CC)"}
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCHSRCDIR)$(DELIM)chip} INCLUDES += ${INCDIR_PREFIX}$(ARCHSRCDIR)$(DELIM)chip
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCHSRCDIR)$(DELIM)common} INCLUDES += ${INCDIR_PREFIX}$(ARCHSRCDIR)$(DELIM)common
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} INCLUDES += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)
CPPFLAGS += $(INCLUDES) CPPFLAGS += $(INCLUDES)

6
arch/z80/src/Makefile.clang
View File

@ -25,9 +25,9 @@ BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
# Tools # Tools
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CFLAGS += -I. CFLAGS += -I.
CPPFLAGS += -D__ASSEMBLY__ CPPFLAGS += -D__ASSEMBLY__

8
arch/z80/src/Makefile.sdccl
View File

@ -23,10 +23,10 @@
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += -D__ASSEMBLY__ CPPFLAGS += -D__ASSEMBLY__

6
arch/z80/src/Makefile.sdccw
View File

@ -21,9 +21,9 @@
# Tools # Tools
# CFLAGS, CPPFLAGS, ASFLAGS, LDFLAGS are set in $(TOPDIR)\Make.defs # CFLAGS, CPPFLAGS, ASFLAGS, LDFLAGS are set in $(TOPDIR)\Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)chip
CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} CFLAGS += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CPPFLAGS += -D__ASSEMBLY__ CPPFLAGS += -D__ASSEMBLY__

2
binfmt/libelf/Make.defs
View File

@ -33,7 +33,7 @@ CSRCS += libelf_uninit.c libelf_unload.c libelf_verify.c
ifeq ($(CONFIG_ELF_COREDUMP),y) ifeq ($(CONFIG_ELF_COREDUMP),y)
CSRCS += libelf_coredump.c CSRCS += libelf_coredump.c
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
endif endif
ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y) ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)

8
boards/Board.mk
View File

@ -58,13 +58,13 @@ ifneq ($(CONFIG_ARCH_FAMILY),)
ARCH_FAMILY = $(patsubst "%",%,$(CONFIG_ARCH_FAMILY)) ARCH_FAMILY = $(patsubst "%",%,$(CONFIG_ARCH_FAMILY))
endif endif
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(SCHEDSRCDIR)"} CFLAGS += ${INCDIR_PREFIX}"$(SCHEDSRCDIR)"
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)chip"} CFLAGS += ${INCDIR_PREFIX}"$(ARCHSRCDIR)$(DELIM)chip"
ifneq ($(CONFIG_ARCH_SIM),y) ifneq ($(CONFIG_ARCH_SIM),y)
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)common"} CFLAGS += ${INCDIR_PREFIX}"$(ARCHSRCDIR)$(DELIM)common"
endif endif
ifneq ($(ARCH_FAMILY),) ifneq ($(ARCH_FAMILY),)
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"} CFLAGS += ${INCDIR_PREFIX}"$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"
endif endif
all: libboard$(LIBEXT) all: libboard$(LIBEXT)

2
drivers/1wire/Make.defs
View File

@ -30,5 +30,5 @@ endif
DEPPATH += --dep-path 1wire DEPPATH += --dep-path 1wire
VPATH += :1wire VPATH += :1wire
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)1wire} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)1wire
endif endif

8
drivers/analog/Make.defs
View File

@ -114,22 +114,22 @@ endif
ifeq ($(CONFIG_DAC),y) ifeq ($(CONFIG_DAC),y)
DEPPATH += --dep-path analog DEPPATH += --dep-path analog
VPATH += :analog VPATH += :analog
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)analog
else else
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
DEPPATH += --dep-path analog DEPPATH += --dep-path analog
VPATH += :analog VPATH += :analog
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)analog
else else
ifeq ($(CONFIG_COMP),y) ifeq ($(CONFIG_COMP),y)
DEPPATH += --dep-path analog DEPPATH += --dep-path analog
VPATH += :analog VPATH += :analog
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)analog
else else
ifeq ($(CONFIG_OPAMP),y) ifeq ($(CONFIG_OPAMP),y)
DEPPATH += --dep-path analog DEPPATH += --dep-path analog
VPATH += :analog VPATH += :analog
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)analog
endif endif
endif endif
endif endif

2
drivers/bch/Make.defs
View File

@ -30,6 +30,6 @@ CSRCS += bchdev_driver.c
DEPPATH += --dep-path bch DEPPATH += --dep-path bch
VPATH += :bch VPATH += :bch
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)bch
endif endif

2
drivers/can/Make.defs
View File

@ -32,5 +32,5 @@ endif
DEPPATH += --dep-path can DEPPATH += --dep-path can
VPATH += :can VPATH += :can
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)can} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)can
endif endif

2
drivers/clk/Make.defs
View File

@ -32,6 +32,6 @@ endif
DEPPATH += --dep-path clk DEPPATH += --dep-path clk
VPATH += :clk VPATH += :clk
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)clk} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)clk
endif endif

2
drivers/contactless/Make.defs
View File

@ -34,5 +34,5 @@ endif
DEPPATH += --dep-path contactless DEPPATH += --dep-path contactless
VPATH += :contactless VPATH += :contactless
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)contactless} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)contactless
endif endif

2
drivers/crypto/Make.defs
View File

@ -28,4 +28,4 @@ endif
DEPPATH += --dep-path crypto DEPPATH += --dep-path crypto
VPATH += :crypto VPATH += :crypto
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)crypto} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)crypto

2
drivers/i2c/Make.defs
View File

@ -46,6 +46,6 @@ endif
DEPPATH += --dep-path i2c DEPPATH += --dep-path i2c
VPATH += :i2c VPATH += :i2c
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)i2c} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)i2c
endif # CONFIG_I2C endif # CONFIG_I2C

2
drivers/input/Make.defs
View File

@ -104,5 +104,5 @@ endif
DEPPATH += --dep-path input DEPPATH += --dep-path input
VPATH += :input VPATH += :input
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)input} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)input
endif endif

4
drivers/ioexpander/Make.defs
View File

@ -71,7 +71,7 @@ ifeq ($(CONFIG_IOEXPANDER),y)
DEPPATH += --dep-path ioexpander DEPPATH += --dep-path ioexpander
VPATH += :ioexpander VPATH += :ioexpander
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander
else ifeq ($(CONFIG_DEV_GPIO),y) else ifeq ($(CONFIG_DEV_GPIO),y)
@ -79,6 +79,6 @@ else ifeq ($(CONFIG_DEV_GPIO),y)
DEPPATH += --dep-path ioexpander DEPPATH += --dep-path ioexpander
VPATH += :ioexpander VPATH += :ioexpander
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander
endif endif

6
drivers/lcd/Make.defs
View File

@ -175,13 +175,13 @@ endif
ifeq ($(CONFIG_LCD),y) ifeq ($(CONFIG_LCD),y)
DEPPATH += --dep-path lcd DEPPATH += --dep-path lcd
VPATH += :lcd VPATH += :lcd
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)lcd
else ifeq ($(CONFIG_SLCD),y) else ifeq ($(CONFIG_SLCD),y)
DEPPATH += --dep-path lcd DEPPATH += --dep-path lcd
VPATH += :lcd VPATH += :lcd
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)lcd
else ifeq ($(CONFIG_LCD_OTHER),y) else ifeq ($(CONFIG_LCD_OTHER),y)
DEPPATH += --dep-path lcd DEPPATH += --dep-path lcd
VPATH += :lcd VPATH += :lcd
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)lcd
endif endif

2
drivers/loop/Make.defs
View File

@ -34,6 +34,6 @@ CSRCS += losetup.c
DEPPATH += --dep-path loop DEPPATH += --dep-path loop
VPATH += :loop VPATH += :loop
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)loop} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)loop
endif endif

2
drivers/mmcsd/Make.defs
View File

@ -34,6 +34,6 @@ endif
DEPPATH += --dep-path mmcsd DEPPATH += --dep-path mmcsd
VPATH += :mmcsd VPATH += :mmcsd
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd
endif endif

2
drivers/modem/Make.defs
View File

@ -30,6 +30,6 @@ include modem/alt1250/Make.defs
DEPPATH += --dep-path modem DEPPATH += --dep-path modem
VPATH += :modem VPATH += :modem
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)modem
endif endif

2
drivers/modem/alt1250/Make.defs
View File

@ -33,6 +33,6 @@ endif
DEPPATH += --dep-path modem$(DELIM)alt1250 DEPPATH += --dep-path modem$(DELIM)alt1250
VPATH += :modem$(DELIM)alt1250 VPATH += :modem$(DELIM)alt1250
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)modem
endif endif

2
drivers/motor/Make.defs
View File

@ -34,7 +34,7 @@ endif
MOTOR_DEPPATH := --dep-path motor MOTOR_DEPPATH := --dep-path motor
MOTOR_VPATH := :motor MOTOR_VPATH := :motor
MOTOR_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)motor} MOTOR_CFLAGS := ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)motor
DEPPATH += $(MOTOR_DEPPATH) DEPPATH += $(MOTOR_DEPPATH)
VPATH += $(MOTOR_VPATH) VPATH += $(MOTOR_VPATH)

2
drivers/motor/foc/Make.defs
View File

@ -30,4 +30,4 @@ endif
DEPPATH += --dep-path motor$(DELIM)foc DEPPATH += --dep-path motor$(DELIM)foc
VPATH += :motor$(DELIM)foc VPATH += :motor$(DELIM)foc
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)motor$(DELIM)foc} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)motor$(DELIM)foc

2
drivers/rc/Make.defs
View File

@ -32,6 +32,6 @@ endif
DEPPATH += --dep-path rc DEPPATH += --dep-path rc
VPATH += :rc VPATH += :rc
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rc} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)rc
endif # CONFIG_REMOTE_CONTROL endif # CONFIG_REMOTE_CONTROL

4
drivers/rptun/Make.defs
View File

@ -30,6 +30,6 @@ endif
DEPPATH += --dep-path rptun DEPPATH += --dep-path rptun
VPATH += :rptun VPATH += :rptun
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)rptun
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)openamp$(DELIM)open-amp$(DELIM)lib} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)openamp$(DELIM)open-amp$(DELIM)lib
endif endif

12
drivers/segger/Make.defs
View File

@ -34,11 +34,11 @@ ifeq ($(CONFIG_SEGGER_RTT),y)
CFLAGS += ${DEFINE_PREFIX}SEGGER_RTT_BUFFER_SECTION=CONFIG_SEGGER_RTT_BUFFER_SECTION CFLAGS += ${DEFINE_PREFIX}SEGGER_RTT_BUFFER_SECTION=CONFIG_SEGGER_RTT_BUFFER_SECTION
endif endif
CFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)config} CFLAGS += ${INCDIR_PREFIX}segger$(DELIM)config
CFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)RTT$(DELIM)RTT} CFLAGS += ${INCDIR_PREFIX}segger$(DELIM)RTT$(DELIM)RTT
ifeq ($(CONFIG_ARCH_ARMV7M),y) ifeq ($(CONFIG_ARCH_ARMV7M),y)
AFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)config} AFLAGS += ${INCDIR_PREFIX}segger$(DELIM)config
ASRCS += segger/RTT/RTT/SEGGER_RTT_ASM_ARMv7M.S ASRCS += segger/RTT/RTT/SEGGER_RTT_ASM_ARMv7M.S
endif endif
@ -62,9 +62,9 @@ ifeq ($(CONFIG_SEGGER_SYSVIEW),y)
CSRCS += segger/note_sysview.c CSRCS += segger/note_sysview.c
CSRCS += segger/SystemView/SYSVIEW/SEGGER_SYSVIEW.c CSRCS += segger/SystemView/SYSVIEW/SEGGER_SYSVIEW.c
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
CFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)SystemView$(DELIM)SEGGER} CFLAGS += ${INCDIR_PREFIX}segger$(DELIM)SystemView$(DELIM)SEGGER
CFLAGS += ${shell $(INCDIR) "$(CC)" segger$(DELIM)SystemView$(DELIM)SYSVIEW} CFLAGS += ${INCDIR_PREFIX}segger$(DELIM)SystemView$(DELIM)SYSVIEW
SYSVIEW_VERSION ?= 3.30 SYSVIEW_VERSION ?= 3.30

2
drivers/sensors/Make.defs
View File

@ -344,6 +344,6 @@ endif
DEPPATH += --dep-path sensors DEPPATH += --dep-path sensors
VPATH += :sensors VPATH += :sensors
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)sensors} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)sensors
endif # CONFIG_SENSORS endif # CONFIG_SENSORS

2
drivers/spi/Make.defs
View File

@ -51,5 +51,5 @@ endif
DEPPATH += --dep-path spi DEPPATH += --dep-path spi
VPATH += :spi VPATH += :spi
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)spi} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)spi
endif endif

2
drivers/usbdev/Make.defs
View File

@ -64,5 +64,5 @@ CSRCS += usbdev_trace.c usbdev_trprintf.c
DEPPATH += --dep-path usbdev DEPPATH += --dep-path usbdev
VPATH += :usbdev VPATH += :usbdev
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)usbdev
endif endif

2
drivers/usbhost/Make.defs
View File

@ -85,4 +85,4 @@ endif
DEPPATH += --dep-path usbhost DEPPATH += --dep-path usbhost
VPATH += :usbhost VPATH += :usbhost
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbhost} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)usbhost

2
drivers/usbmisc/Make.defs
View File

@ -34,5 +34,5 @@ endif
DEPPATH += --dep-path usbmisc DEPPATH += --dep-path usbmisc
VPATH += :usbmisc VPATH += :usbmisc
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc
endif endif

2
drivers/usbmonitor/Make.defs
View File

@ -30,6 +30,6 @@ CSRCS += usbmonitor.c
DEPPATH += --dep-path usbmonitor DEPPATH += --dep-path usbmonitor
VPATH += :usbmonitor VPATH += :usbmonitor
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor
endif endif

2
drivers/video/Make.defs
View File

@ -64,6 +64,6 @@ include video/vnc/Make.defs
DEPPATH += --dep-path video DEPPATH += --dep-path video
VPATH += :video VPATH += :video
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)video
endif endif

2
drivers/video/vnc/Make.defs
View File

@ -32,7 +32,7 @@ CSRCS += vnc_kbd.c
endif endif
DEPPATH += --dep-path video/vnc DEPPATH += --dep-path video/vnc
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video$(DELIM)vnc} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)video$(DELIM)vnc
VPATH += :video/vnc VPATH += :video/vnc
endif endif

2
drivers/wireless/Make.defs
View File

@ -67,5 +67,5 @@ endif
DEPPATH += --dep-path wireless DEPPATH += --dep-path wireless
VPATH += :wireless VPATH += :wireless
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless
endif endif

2
drivers/wireless/bluetooth/Make.defs
View File

@ -52,6 +52,6 @@ endif
DEPPATH += --dep-path wireless$(DELIM)bluetooth DEPPATH += --dep-path wireless$(DELIM)bluetooth
VPATH += :wireless$(DELIM)bluetooth VPATH += :wireless$(DELIM)bluetooth
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth
endif # CONFIG_DRIVERS_BLUETOOTH endif # CONFIG_DRIVERS_BLUETOOTH

2
drivers/wireless/ieee80211/bcm43xxx/Make.defs
View File

@ -67,6 +67,6 @@ endif
DEPPATH += --dep-path wireless$(DELIM)ieee80211$(DELIM)bcm43xxx DEPPATH += --dep-path wireless$(DELIM)ieee80211$(DELIM)bcm43xxx
VPATH += :wireless$(DELIM)ieee80211$(DELIM)bcm43xxx VPATH += :wireless$(DELIM)ieee80211$(DELIM)bcm43xxx
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee80211$(DELIM)bcm43xxx} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee80211$(DELIM)bcm43xxx
endif # CONFIG_IEEE80211_BROADCOM_FULLMAC endif # CONFIG_IEEE80211_BROADCOM_FULLMAC

2
drivers/wireless/ieee802154/Make.defs
View File

@ -34,6 +34,6 @@ include wireless/ieee802154/xbee/Make.defs
DEPPATH += --dep-path wireless$(DELIM)ieee802154 DEPPATH += --dep-path wireless$(DELIM)ieee802154
VPATH += :wireless$(DELIM)ieee802154 VPATH += :wireless$(DELIM)ieee802154
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154
endif # CONFIG_DRIVERS_IEEE802154 endif # CONFIG_DRIVERS_IEEE802154

2
drivers/wireless/ieee802154/at86rf23x/Make.defs
View File

@ -28,6 +28,6 @@ CSRCS += at86rf23x.c
DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)at86rf23x DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)at86rf23x
VPATH += :wireless$(DELIM)ieee802154$(DELIM)at86rf23x VPATH += :wireless$(DELIM)ieee802154$(DELIM)at86rf23x
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)at86rf23x} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)at86rf23x
endif # CONFIG_IEEE802154_AT86RF233 endif # CONFIG_IEEE802154_AT86RF233

2
drivers/wireless/ieee802154/mrf24j40/Make.defs
View File

@ -29,6 +29,6 @@ CSRCS += mrf24j40_regops.c mrf24j40.c
DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)mrf24j40 DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)mrf24j40
VPATH += :wireless$(DELIM)ieee802154$(DELIM)mrf24j40 VPATH += :wireless$(DELIM)ieee802154$(DELIM)mrf24j40
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)mrf24j40} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)mrf24j40
endif # CONFIG_IEEE802154_MRF24J40 endif # CONFIG_IEEE802154_MRF24J40

2
drivers/wireless/ieee802154/xbee/Make.defs
View File

@ -28,6 +28,6 @@ CSRCS += xbee_ioctl.c xbee_mac.c xbee_netdev.c xbee.c
DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)xbee DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)xbee
VPATH += :wireless$(DELIM)ieee802154$(DELIM)xbee VPATH += :wireless$(DELIM)ieee802154$(DELIM)xbee
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)xbee} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)xbee
endif # CONFIG_IEEE802154_XBEE endif # CONFIG_IEEE802154_XBEE

2
drivers/wireless/lpwan/sx127x/Make.defs
View File

@ -28,6 +28,6 @@ CSRCS += sx127x.c
DEPPATH += --dep-path wireless$(DELIM)lpwan$(DELIM)sx127x DEPPATH += --dep-path wireless$(DELIM)lpwan$(DELIM)sx127x
VPATH += :wireless$(DELIM)lpwan$(DELIM)sx127x VPATH += :wireless$(DELIM)lpwan$(DELIM)sx127x
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x
endif # CONFIG_LPWAN_SX127X endif # CONFIG_LPWAN_SX127X

4
drivers/wireless/spirit/drivers/Make.defs
View File

@ -28,7 +28,7 @@ CSRCS += spirit_netdev.c
DEPPATH += --dep-path wireless$(DELIM)spirit$(DELIM)drivers DEPPATH += --dep-path wireless$(DELIM)spirit$(DELIM)drivers
VPATH += :wireless$(DELIM)spirit$(DELIM)drivers VPATH += :wireless$(DELIM)spirit$(DELIM)drivers
CFLAGS += ${shell $(INCDIR) "$(CC)" \ CFLAGS += ${INCDIR_PREFIX}\
$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)drivers} $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)drivers
endif # CONFIG_SPIRIT_NETDEV endif # CONFIG_SPIRIT_NETDEV

4
drivers/wireless/spirit/include/Make.defs
View File

@ -20,5 +20,5 @@
# Add path to include Spirit header files in CFLAGS # Add path to include Spirit header files in CFLAGS
CFLAGS += ${shell $(INCDIR) "$(CC)" \ CFLAGS += ${INCDIR_PREFIX}\
$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)include} $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)include

4
fs/Makefile
View File

@ -59,8 +59,8 @@ include rpmsgfs/Make.defs
endif endif
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)fs} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)fs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))

2
fs/spiffs/Make.defs
View File

@ -28,6 +28,6 @@ CSRCS += spiffs_cache.c spiffs_check.c spiffs_mtd.c
DEPPATH += --dep-path spiffs/src DEPPATH += --dep-path spiffs/src
VPATH += :spiffs/src VPATH += :spiffs/src
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src
endif endif

2
graphics/Makefile
View File

@ -25,7 +25,7 @@ include nxbe/Make.defs
include nxmu/Make.defs include nxmu/Make.defs
include nxterm/Make.defs include nxterm/Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)graphics} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)graphics
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))

2
graphics/nxbe/Make.defs
View File

@ -40,5 +40,5 @@ CSRCS += nxbe_notify_rectangle.c
endif endif
DEPPATH += --dep-path nxbe DEPPATH += --dep-path nxbe
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxbe} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/graphics/nxbe
VPATH += :nxbe VPATH += :nxbe

2
graphics/nxglib/Make.defs
View File

@ -96,6 +96,6 @@ CSRCS += nxglib_cursor_backup_24bpp.c nxglib_cursor_backup_32bpp.c
endif endif
DEPPATH += --dep-path nxglib DEPPATH += --dep-path nxglib
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxglib} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/graphics/nxglib
#VPATH += :nxglib #VPATH += :nxglib
VPATH = nxglib VPATH = nxglib

2
graphics/nxglib/Makefile.cursor
View File

@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
CPPFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)graphics$(DELIM)nxglib} CPPFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)graphics$(DELIM)nxglib
ifeq ($(NXGLIB_BITSPERPIXEL),8) ifeq ($(NXGLIB_BITSPERPIXEL),8)
NXGLIB_SUFFIX := _8bpp NXGLIB_SUFFIX := _8bpp

2
graphics/nxglib/Makefile.devblit
View File

@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
CPPFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)graphics$(DELIM)nxglib} CPPFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)graphics$(DELIM)nxglib
ifeq ($(NXGLIB_BITSPERPIXEL),1) ifeq ($(NXGLIB_BITSPERPIXEL),1)
NXGLIB_SUFFIX := _1bpp NXGLIB_SUFFIX := _1bpp

2
graphics/nxglib/Makefile.pwfb
View File

@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
CPPFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)graphics$(DELIM)nxglib} CPPFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)graphics$(DELIM)nxglib
ifeq ($(NXGLIB_BITSPERPIXEL),1) ifeq ($(NXGLIB_BITSPERPIXEL),1)
NXGLIB_SUFFIX := _1bpp NXGLIB_SUFFIX := _1bpp

2
graphics/nxmu/Make.defs
View File

@ -24,5 +24,5 @@ CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
CSRCS += nxmu_start.c CSRCS += nxmu_start.c
DEPPATH += --dep-path nxmu DEPPATH += --dep-path nxmu
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxmu} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/graphics/nxmu
VPATH += :nxmu VPATH += :nxmu

2
graphics/nxterm/Make.defs
View File

@ -33,7 +33,7 @@ CSRCS += nxterm_kbdin.c
endif endif
DEPPATH += --dep-path nxterm DEPPATH += --dep-path nxterm
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxterm} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)/graphics/nxterm
VPATH += :nxterm VPATH += :nxterm
endif endif

2
libs/libc/Makefile
View File

@ -67,7 +67,7 @@ include wchar/Make.defs
include wctype/Make.defs include wctype/Make.defs
include wqueue/Make.defs include wqueue/Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)libs$(DELIM)libc} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)libs$(DELIM)libc
# Rule for the symbol table generation # Rule for the symbol table generation

2
libs/libc/audio/libsrc/Make.defs
View File

@ -38,7 +38,7 @@ CSRCS += src_zoh.c
CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)audio} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)audio
ifeq ($(CONFIG_SINC_FAST_CONVERTER),y) ifeq ($(CONFIG_SINC_FAST_CONVERTER),y)
CFLAGS += -DENABLE_SINC_FAST_CONVERTER CFLAGS += -DENABLE_SINC_FAST_CONVERTER

2
libs/libnx/Makefile
View File

@ -28,7 +28,7 @@ include nxtk/Make.defs
BINDIR ?= bin BINDIR ?= bin
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)libs$(DELIM)libnx} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)libs$(DELIM)libnx
AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS)) AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS))
COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)%$(OBJEXT), $(CSRCS)) COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)%$(OBJEXT), $(CSRCS))

2
mm/Makefile
View File

@ -35,7 +35,7 @@ include ubsan/Make.defs
BINDIR ?= bin BINDIR ?= bin
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)mm} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)mm
AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS)) AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS))
COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)%$(OBJEXT), $(CSRCS)) COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)%$(OBJEXT), $(CSRCS))

2
mm/iob/Make.defs
View File

@ -46,6 +46,6 @@ endif
DEPPATH += --dep-path iob DEPPATH += --dep-path iob
VPATH += :iob VPATH += :iob
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)mm$(DELIM)iob} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)mm$(DELIM)iob
endif # CONFIG_MM_IOB endif # CONFIG_MM_IOB

2
net/Makefile
View File

@ -53,7 +53,7 @@ include usrsock/Make.defs
include utils/Make.defs include utils/Make.defs
endif endif
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)net} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)net
ASRCS = $(SOCK_ASRCS) $(NETDEV_ASRCS) $(NET_ASRCS) ASRCS = $(SOCK_ASRCS) $(NETDEV_ASRCS) $(NET_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))

2
sched/Makefile
View File

@ -38,7 +38,7 @@ include tls/Make.defs
include wdog/Make.defs include wdog/Make.defs
include wqueue/Make.defs include wqueue/Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)sched
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))

14
tools/Config.mk
View File

@ -578,6 +578,8 @@ $(1)_$(2):
endef endef
export DEFINE_PREFIX := $(subst X,,${shell $(DEFINE) "$(CC)" "X"}) export DEFINE_PREFIX := $(subst X,,${shell $(DEFINE) "$(CC)" "X"})
export INCDIR_PREFIX := $(subst "X",,${shell $(INCDIR) "$(CC)" "X"})
export INCSYSDIR_PREFIX := $(subst "X",,${shell $(INCDIR) -s "$(CC)" "X"})
# ARCHxxx means the predefined setting(either toolchain, arch, or system specific) # ARCHxxx means the predefined setting(either toolchain, arch, or system specific)
ARCHDEFINES += ${DEFINE_PREFIX}__NuttX__ ARCHDEFINES += ${DEFINE_PREFIX}__NuttX__
@ -587,19 +589,19 @@ endif
# The default C/C++ search path # The default C/C++ search path
ARCHINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include} ARCHINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include
ifeq ($(CONFIG_LIBCXX),y) ifeq ($(CONFIG_LIBCXX),y)
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)libcxx} ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)libcxx
else ifeq ($(CONFIG_UCLIBCXX),y) else ifeq ($(CONFIG_UCLIBCXX),y)
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)uClibc++} ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)uClibc++
else else
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)cxx} ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)cxx
ifeq ($(CONFIG_ETL),y) ifeq ($(CONFIG_ETL),y)
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)etl} ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)etl
endif endif
endif endif
ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include} ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include
# Convert filepaths to their proper system format (i.e. Windows/Unix) # Convert filepaths to their proper system format (i.e. Windows/Unix)

2
wireless/bluetooth/Make.defs
View File

@ -36,6 +36,6 @@ endif
DEPPATH += --dep-path bluetooth DEPPATH += --dep-path bluetooth
VPATH += :bluetooth VPATH += :bluetooth
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth
endif # CONFIG_WIRELESS_BLUETOOTH endif # CONFIG_WIRELESS_BLUETOOTH

2
wireless/ieee802154/Make.defs
View File

@ -51,6 +51,6 @@ endif
DEPPATH += --dep-path ieee802154 DEPPATH += --dep-path ieee802154
VPATH += :ieee802154 VPATH += :ieee802154
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154
endif # CONFIG_WIRELESS_IEEE802154 endif # CONFIG_WIRELESS_IEEE802154

2
wireless/pktradio/Make.defs
View File

@ -30,6 +30,6 @@ endif
DEPPATH += --dep-path pktradio DEPPATH += --dep-path pktradio
VPATH += :pktradio VPATH += :pktradio
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio} CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)wireless$(DELIM)pktradio
endif # CONFIG_WIRELESS_PKTRADIO endif # CONFIG_WIRELESS_PKTRADIO