Skip to content

Commit

Permalink
build: Move INCDIROPT to common place
Browse files Browse the repository at this point in the history 
Signed-off-by: Xiang Xiao <[email protected]>
  • Loading branch information
@xiaoxiang781216 @patacongo
xiaoxiang781216 authored and patacongo committed May 18, 2020
1 parent bd65688 commit 5eae325
Show file tree
Hide file tree
Showing 102 changed files with 113 additions and 137 deletions.
4 changes: 0 additions & 4 deletions audio/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)

ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif

DEPPATH = --dep-path .
ASRCS =
CSRCS = audio.c
Expand Down
4 changes: 0 additions & 4 deletions binfmt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)

ifeq ($(WINTCONFIG_CYGWIN_WINTOOLOOL),y)
INCDIROPT = -w
endif

# Basic BINFMT source files

BINFMT_ASRCS =
Expand Down
8 changes: 4 additions & 4 deletions boards/Board.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ endif
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
else
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(SCHEDSRCDIR)"}
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)chip"}
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(SCHEDSRCDIR)"}
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)chip"}
ifneq ($(CONFIG_ARCH_SIM),y)
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)common"}
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)common"}
ifneq ($(ARCH_FAMILY),)
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"}
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"}
endif
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/cxd56xx/common/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ endif

DEPPATH += --dep-path src
VPATH += :src
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
2 changes: 1 addition & 1 deletion boards/arm/cxd56xx/drivers/audio/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ endif

DEPPATH += --dep-path platform$(DELIM)audio
VPATH += :platform$(DELIM)audio
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)audio)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)audio)
2 changes: 1 addition & 1 deletion boards/arm/cxd56xx/drivers/camera/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ endif

DEPPATH += --dep-path platform$(DELIM)camera
VPATH += :platform$(DELIM)camera
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)camera)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)camera)
2 changes: 1 addition & 1 deletion boards/arm/cxd56xx/drivers/sensors/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ endif

DEPPATH += --dep-path platform$(DELIM)sensors
VPATH += :platform$(DELIM)sensors
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors)
2 changes: 1 addition & 1 deletion boards/arm/cxd56xx/spresense/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/axoloti/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/clicker2-stm32/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/cloudctrl/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/common/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ include $(TOPDIR)/boards/Board.mk

ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BOARDDIR)$(DELIM)include)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(BOARDDIR)$(DELIM)include)

2 changes: 1 addition & 1 deletion boards/arm/stm32/common/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ endif

DEPPATH += --dep-path src
VPATH += :src
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
2 changes: 1 addition & 1 deletion boards/arm/stm32/fire-stm32v2/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/hymini-stm32v/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/maple/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/mikroe-stm32f4/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f103rb/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f207zg/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f302r8/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f303re/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f303ze/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f334r8/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f410rb/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f429zi/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f446re/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-f4x1re/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/nucleo-l152re/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimex-stm32-e407/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimex-stm32-h405/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimex-stm32-h407/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimex-stm32-p107/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimex-stm32-p207/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimex-stm32-p407/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/olimexino-stm32/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/omnibusf4/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/photon/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/shenzhou/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm3210e-eval/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm3220g-eval/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm3240g-eval/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32_tiny/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)

2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32butterfly2/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32f103-minimum/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32f334-disco/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32f3discovery/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32f411e-disco/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32f429i-disco/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32f4discovery/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32ldiscovery/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/stm32vldiscovery/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion boards/arm/stm32/viewtool-stm32f107/src/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
2 changes: 1 addition & 1 deletion drivers/1wire/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ endif

DEPPATH += --dep-path 1wire
VPATH += :1wire
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)1wire}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)1wire}
endif
4 changes: 0 additions & 4 deletions drivers/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)

ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif

DEPPATH = --dep-path .
ASRCS =
CSRCS =
Expand Down
8 changes: 4 additions & 4 deletions drivers/analog/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,22 @@ endif
ifeq ($(CONFIG_DAC),y)
DEPPATH += --dep-path analog
VPATH += :analog
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
else
ifeq ($(CONFIG_ADC),y)
DEPPATH += --dep-path analog
VPATH += :analog
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
else
ifeq ($(CONFIG_COMP),y)
DEPPATH += --dep-path analog
VPATH += :analog
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
else
ifeq ($(CONFIG_OPAMP),y)
DEPPATH += --dep-path analog
VPATH += :analog
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
endif
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion drivers/bch/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ CSRCS += bchdev_driver.c

DEPPATH += --dep-path bch
VPATH += :bch
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch}

endif
2 changes: 1 addition & 1 deletion drivers/can/Make.defs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ endif

DEPPATH += --dep-path can
VPATH += :can
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)can}
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)can}
endif
Loading

0 comments on commit 5eae325

Please sign in to comment.