This is an automated email from the ASF dual-hosted git repository. gnutt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5eae32577e5d5226e5d3027c169eeb369f83f77d Author: Xiang Xiao <[email protected]> AuthorDate: Thu Mar 26 11:51:22 2020 +0800 build: Move INCDIROPT to common place Signed-off-by: Xiang Xiao <[email protected]> --- audio/Makefile | 4 ---- binfmt/Makefile | 4 ---- boards/Board.mk | 8 ++++---- boards/arm/cxd56xx/common/src/Make.defs | 2 +- boards/arm/cxd56xx/drivers/audio/Make.defs | 2 +- boards/arm/cxd56xx/drivers/camera/Make.defs | 2 +- boards/arm/cxd56xx/drivers/sensors/Make.defs | 2 +- boards/arm/cxd56xx/spresense/src/Make.defs | 2 +- boards/arm/stm32/axoloti/src/Make.defs | 2 +- boards/arm/stm32/clicker2-stm32/src/Make.defs | 2 +- boards/arm/stm32/cloudctrl/src/Make.defs | 2 +- boards/arm/stm32/common/Makefile | 2 +- boards/arm/stm32/common/src/Make.defs | 2 +- boards/arm/stm32/fire-stm32v2/src/Make.defs | 2 +- boards/arm/stm32/hymini-stm32v/src/Make.defs | 2 +- boards/arm/stm32/maple/src/Make.defs | 2 +- boards/arm/stm32/mikroe-stm32f4/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f103rb/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f207zg/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f302r8/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f303re/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f303ze/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f334r8/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f410rb/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f429zi/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f446re/src/Make.defs | 2 +- boards/arm/stm32/nucleo-f4x1re/src/Make.defs | 2 +- boards/arm/stm32/nucleo-l152re/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-e407/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-h405/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-h407/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-p107/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-p207/src/Make.defs | 2 +- boards/arm/stm32/olimex-stm32-p407/src/Make.defs | 2 +- boards/arm/stm32/olimexino-stm32/src/Make.defs | 2 +- boards/arm/stm32/omnibusf4/src/Make.defs | 2 +- boards/arm/stm32/photon/src/Make.defs | 2 +- boards/arm/stm32/shenzhou/src/Make.defs | 2 +- boards/arm/stm32/stm3210e-eval/src/Make.defs | 2 +- boards/arm/stm32/stm3220g-eval/src/Make.defs | 2 +- boards/arm/stm32/stm3240g-eval/src/Make.defs | 2 +- boards/arm/stm32/stm32_tiny/src/Make.defs | 2 +- boards/arm/stm32/stm32butterfly2/src/Make.defs | 2 +- boards/arm/stm32/stm32f103-minimum/src/Make.defs | 2 +- boards/arm/stm32/stm32f334-disco/src/Make.defs | 2 +- boards/arm/stm32/stm32f3discovery/src/Make.defs | 2 +- boards/arm/stm32/stm32f411e-disco/src/Make.defs | 2 +- boards/arm/stm32/stm32f429i-disco/src/Make.defs | 2 +- boards/arm/stm32/stm32f4discovery/src/Make.defs | 2 +- boards/arm/stm32/stm32ldiscovery/src/Make.defs | 2 +- boards/arm/stm32/stm32vldiscovery/src/Make.defs | 2 +- boards/arm/stm32/viewtool-stm32f107/src/Make.defs | 2 +- drivers/1wire/Make.defs | 2 +- drivers/Makefile | 4 ---- drivers/analog/Make.defs | 8 ++++---- drivers/bch/Make.defs | 2 +- drivers/can/Make.defs | 2 +- drivers/contactless/Make.defs | 2 +- drivers/crypto/Make.defs | 2 +- drivers/i2c/Make.defs | 2 +- drivers/input/Make.defs | 2 +- drivers/ioexpander/Make.defs | 4 ++-- drivers/lcd/Make.defs | 6 +++--- drivers/loop/Make.defs | 2 +- drivers/mmcsd/Make.defs | 2 +- drivers/modem/Make.defs | 2 +- drivers/modem/altair/Make.defs | 2 +- drivers/power/Make.defs | 14 +++++++------- drivers/rptun/Make.defs | 2 +- drivers/sensors/Make.defs | 2 +- drivers/spi/Make.defs | 2 +- drivers/usbdev/Make.defs | 2 +- drivers/usbhost/Make.defs | 2 +- drivers/usbmisc/Make.defs | 2 +- drivers/usbmonitor/Make.defs | 2 +- drivers/video/Make.defs | 2 +- drivers/wireless/Make.defs | 2 +- drivers/wireless/bluetooth/Make.defs | 2 +- drivers/wireless/ieee80211/bcm43xxx/Make.defs | 2 +- drivers/wireless/ieee802154/Make.defs | 2 +- drivers/wireless/ieee802154/at86rf23x/Make.defs | 2 +- drivers/wireless/ieee802154/mrf24j40/Make.defs | 2 +- drivers/wireless/ieee802154/xbee/Make.defs | 2 +- drivers/wireless/lpwan/sx127x/Make.defs | 2 +- drivers/wireless/spirit/drivers/Make.defs | 2 +- drivers/wireless/spirit/include/Make.defs | 2 +- fs/spiffs/Make.defs | 2 +- graphics/Makefile | 4 ---- graphics/nxbe/Make.defs | 2 +- graphics/nxglib/Make.defs | 3 ++- graphics/nxmu/Make.defs | 2 +- graphics/nxterm/Make.defs | 2 +- graphics/vnc/client/Make.defs | 2 +- graphics/vnc/server/Make.defs | 2 +- libs/libc/zoneinfo/Makefile | 4 ---- mm/iob/Make.defs | 2 +- pass1/Makefile | 4 ---- tools/Config.mk | 3 +++ wireless/Makefile | 4 ---- wireless/bluetooth/Make.defs | 2 +- wireless/ieee802154/Make.defs | 2 +- wireless/pktradio/Make.defs | 2 +- 102 files changed, 113 insertions(+), 137 deletions(-) diff --git a/audio/Makefile b/audio/Makefile index 6814e15..426caae 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -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 diff --git a/binfmt/Makefile b/binfmt/Makefile index 2769465..19b98cf 100644 --- a/binfmt/Makefile +++ b/binfmt/Makefile @@ -37,10 +37,6 @@ -include $(TOPDIR)/Make.defs DELIM ?= $(strip /) -ifeq ($(WINTCONFIG_CYGWIN_WINTOOLOOL),y) -INCDIROPT = -w -endif - # Basic BINFMT source files BINFMT_ASRCS = diff --git a/boards/Board.mk b/boards/Board.mk index 9ca2274..2edabad 100644 --- a/boards/Board.mk +++ b/boards/Board.mk @@ -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 diff --git a/boards/arm/cxd56xx/common/src/Make.defs b/boards/arm/cxd56xx/common/src/Make.defs index 5b427b1..4e11b75 100644 --- a/boards/arm/cxd56xx/common/src/Make.defs +++ b/boards/arm/cxd56xx/common/src/Make.defs @@ -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) diff --git a/boards/arm/cxd56xx/drivers/audio/Make.defs b/boards/arm/cxd56xx/drivers/audio/Make.defs index 49be780..39f15d2 100644 --- a/boards/arm/cxd56xx/drivers/audio/Make.defs +++ b/boards/arm/cxd56xx/drivers/audio/Make.defs @@ -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) diff --git a/boards/arm/cxd56xx/drivers/camera/Make.defs b/boards/arm/cxd56xx/drivers/camera/Make.defs index dffad76..ff47c27 100644 --- a/boards/arm/cxd56xx/drivers/camera/Make.defs +++ b/boards/arm/cxd56xx/drivers/camera/Make.defs @@ -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) diff --git a/boards/arm/cxd56xx/drivers/sensors/Make.defs b/boards/arm/cxd56xx/drivers/sensors/Make.defs index 7f6706d..afd77ce 100644 --- a/boards/arm/cxd56xx/drivers/sensors/Make.defs +++ b/boards/arm/cxd56xx/drivers/sensors/Make.defs @@ -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) diff --git a/boards/arm/cxd56xx/spresense/src/Make.defs b/boards/arm/cxd56xx/spresense/src/Make.defs index 598deed..be47e8d 100644 --- a/boards/arm/cxd56xx/spresense/src/Make.defs +++ b/boards/arm/cxd56xx/spresense/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/axoloti/src/Make.defs b/boards/arm/stm32/axoloti/src/Make.defs index 4145f00..fe77f5f 100644 --- a/boards/arm/stm32/axoloti/src/Make.defs +++ b/boards/arm/stm32/axoloti/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/clicker2-stm32/src/Make.defs b/boards/arm/stm32/clicker2-stm32/src/Make.defs index 547f463..898af31 100644 --- a/boards/arm/stm32/clicker2-stm32/src/Make.defs +++ b/boards/arm/stm32/clicker2-stm32/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/cloudctrl/src/Make.defs b/boards/arm/stm32/cloudctrl/src/Make.defs index 7bcb538..77c72b4 100644 --- a/boards/arm/stm32/cloudctrl/src/Make.defs +++ b/boards/arm/stm32/cloudctrl/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/common/Makefile b/boards/arm/stm32/common/Makefile index c2531d0..19a8801 100644 --- a/boards/arm/stm32/common/Makefile +++ b/boards/arm/stm32/common/Makefile @@ -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) diff --git a/boards/arm/stm32/common/src/Make.defs b/boards/arm/stm32/common/src/Make.defs index a309b06..4ff9bb9 100644 --- a/boards/arm/stm32/common/src/Make.defs +++ b/boards/arm/stm32/common/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/fire-stm32v2/src/Make.defs b/boards/arm/stm32/fire-stm32v2/src/Make.defs index 5c1893b..a7a5e99 100644 --- a/boards/arm/stm32/fire-stm32v2/src/Make.defs +++ b/boards/arm/stm32/fire-stm32v2/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/hymini-stm32v/src/Make.defs b/boards/arm/stm32/hymini-stm32v/src/Make.defs index 4fa3add..5995bf4 100644 --- a/boards/arm/stm32/hymini-stm32v/src/Make.defs +++ b/boards/arm/stm32/hymini-stm32v/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/maple/src/Make.defs b/boards/arm/stm32/maple/src/Make.defs index fe5d47d..109b67e 100644 --- a/boards/arm/stm32/maple/src/Make.defs +++ b/boards/arm/stm32/maple/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/mikroe-stm32f4/src/Make.defs b/boards/arm/stm32/mikroe-stm32f4/src/Make.defs index 4312038..66cb935 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/Make.defs +++ b/boards/arm/stm32/mikroe-stm32f4/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f103rb/src/Make.defs b/boards/arm/stm32/nucleo-f103rb/src/Make.defs index 1435901..6a9332d 100644 --- a/boards/arm/stm32/nucleo-f103rb/src/Make.defs +++ b/boards/arm/stm32/nucleo-f103rb/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f207zg/src/Make.defs b/boards/arm/stm32/nucleo-f207zg/src/Make.defs index 31610e2..e90a50a 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/Make.defs +++ b/boards/arm/stm32/nucleo-f207zg/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f302r8/src/Make.defs b/boards/arm/stm32/nucleo-f302r8/src/Make.defs index 25496cf..d2368d9 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/Make.defs +++ b/boards/arm/stm32/nucleo-f302r8/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f303re/src/Make.defs b/boards/arm/stm32/nucleo-f303re/src/Make.defs index 4d23e1a..390faf1 100644 --- a/boards/arm/stm32/nucleo-f303re/src/Make.defs +++ b/boards/arm/stm32/nucleo-f303re/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f303ze/src/Make.defs b/boards/arm/stm32/nucleo-f303ze/src/Make.defs index 53fcd29..5289529 100644 --- a/boards/arm/stm32/nucleo-f303ze/src/Make.defs +++ b/boards/arm/stm32/nucleo-f303ze/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f334r8/src/Make.defs b/boards/arm/stm32/nucleo-f334r8/src/Make.defs index b05ca7c..1dde5ff 100644 --- a/boards/arm/stm32/nucleo-f334r8/src/Make.defs +++ b/boards/arm/stm32/nucleo-f334r8/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f410rb/src/Make.defs b/boards/arm/stm32/nucleo-f410rb/src/Make.defs index d8dda5e..834c7ec 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/Make.defs +++ b/boards/arm/stm32/nucleo-f410rb/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f429zi/src/Make.defs b/boards/arm/stm32/nucleo-f429zi/src/Make.defs index 5301501..a1fc8d3 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/Make.defs +++ b/boards/arm/stm32/nucleo-f429zi/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f446re/src/Make.defs b/boards/arm/stm32/nucleo-f446re/src/Make.defs index 395328c..a33237c 100644 --- a/boards/arm/stm32/nucleo-f446re/src/Make.defs +++ b/boards/arm/stm32/nucleo-f446re/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-f4x1re/src/Make.defs b/boards/arm/stm32/nucleo-f4x1re/src/Make.defs index d38cb8b..527bd15 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/Make.defs +++ b/boards/arm/stm32/nucleo-f4x1re/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/nucleo-l152re/src/Make.defs b/boards/arm/stm32/nucleo-l152re/src/Make.defs index 379177c..2fd5ddd 100644 --- a/boards/arm/stm32/nucleo-l152re/src/Make.defs +++ b/boards/arm/stm32/nucleo-l152re/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimex-stm32-e407/src/Make.defs b/boards/arm/stm32/olimex-stm32-e407/src/Make.defs index e50f4e8..e8bf359 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-e407/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimex-stm32-h405/src/Make.defs b/boards/arm/stm32/olimex-stm32-h405/src/Make.defs index 8ea8b0e..443b35f 100644 --- a/boards/arm/stm32/olimex-stm32-h405/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-h405/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimex-stm32-h407/src/Make.defs b/boards/arm/stm32/olimex-stm32-h407/src/Make.defs index ee3f2aa..bb05ea5 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-h407/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimex-stm32-p107/src/Make.defs b/boards/arm/stm32/olimex-stm32-p107/src/Make.defs index 8e5eb66..4d45466 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p107/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimex-stm32-p207/src/Make.defs b/boards/arm/stm32/olimex-stm32-p207/src/Make.defs index 82a328d..d385543 100644 --- a/boards/arm/stm32/olimex-stm32-p207/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p207/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimex-stm32-p407/src/Make.defs b/boards/arm/stm32/olimex-stm32-p407/src/Make.defs index 53d9795..39edf02 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/olimexino-stm32/src/Make.defs b/boards/arm/stm32/olimexino-stm32/src/Make.defs index db7e407..394be3a 100644 --- a/boards/arm/stm32/olimexino-stm32/src/Make.defs +++ b/boards/arm/stm32/olimexino-stm32/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/omnibusf4/src/Make.defs b/boards/arm/stm32/omnibusf4/src/Make.defs index f3b4145..0a54325 100644 --- a/boards/arm/stm32/omnibusf4/src/Make.defs +++ b/boards/arm/stm32/omnibusf4/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/photon/src/Make.defs b/boards/arm/stm32/photon/src/Make.defs index 90305c0..8021426 100644 --- a/boards/arm/stm32/photon/src/Make.defs +++ b/boards/arm/stm32/photon/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/shenzhou/src/Make.defs b/boards/arm/stm32/shenzhou/src/Make.defs index eaa0212..5ca9c97 100644 --- a/boards/arm/stm32/shenzhou/src/Make.defs +++ b/boards/arm/stm32/shenzhou/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm3210e-eval/src/Make.defs b/boards/arm/stm32/stm3210e-eval/src/Make.defs index 4f7186f..bb5cd82 100644 --- a/boards/arm/stm32/stm3210e-eval/src/Make.defs +++ b/boards/arm/stm32/stm3210e-eval/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm3220g-eval/src/Make.defs b/boards/arm/stm32/stm3220g-eval/src/Make.defs index 655c419..f906ec4 100644 --- a/boards/arm/stm32/stm3220g-eval/src/Make.defs +++ b/boards/arm/stm32/stm3220g-eval/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm3240g-eval/src/Make.defs b/boards/arm/stm32/stm3240g-eval/src/Make.defs index c56e111..5948fac 100644 --- a/boards/arm/stm32/stm3240g-eval/src/Make.defs +++ b/boards/arm/stm32/stm3240g-eval/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32_tiny/src/Make.defs b/boards/arm/stm32/stm32_tiny/src/Make.defs index 0ec9bfd..8da5bf9 100644 --- a/boards/arm/stm32/stm32_tiny/src/Make.defs +++ b/boards/arm/stm32/stm32_tiny/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32butterfly2/src/Make.defs b/boards/arm/stm32/stm32butterfly2/src/Make.defs index 753d19a..15f4cc0 100644 --- a/boards/arm/stm32/stm32butterfly2/src/Make.defs +++ b/boards/arm/stm32/stm32butterfly2/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32f103-minimum/src/Make.defs b/boards/arm/stm32/stm32f103-minimum/src/Make.defs index b8d3c26..eebdb81 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/Make.defs +++ b/boards/arm/stm32/stm32f103-minimum/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32f334-disco/src/Make.defs b/boards/arm/stm32/stm32f334-disco/src/Make.defs index 3248c5a..805f1d6 100644 --- a/boards/arm/stm32/stm32f334-disco/src/Make.defs +++ b/boards/arm/stm32/stm32f334-disco/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32f3discovery/src/Make.defs b/boards/arm/stm32/stm32f3discovery/src/Make.defs index 66b8eea..50ca6f0 100644 --- a/boards/arm/stm32/stm32f3discovery/src/Make.defs +++ b/boards/arm/stm32/stm32f3discovery/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32f411e-disco/src/Make.defs b/boards/arm/stm32/stm32f411e-disco/src/Make.defs index 81289b3..7d9c0d5 100644 --- a/boards/arm/stm32/stm32f411e-disco/src/Make.defs +++ b/boards/arm/stm32/stm32f411e-disco/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32f429i-disco/src/Make.defs b/boards/arm/stm32/stm32f429i-disco/src/Make.defs index bc7ec06..13ec5d8 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/Make.defs +++ b/boards/arm/stm32/stm32f429i-disco/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32f4discovery/src/Make.defs b/boards/arm/stm32/stm32f4discovery/src/Make.defs index 82f7217..1b1807d 100644 --- a/boards/arm/stm32/stm32f4discovery/src/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32ldiscovery/src/Make.defs b/boards/arm/stm32/stm32ldiscovery/src/Make.defs index ae3dfef..49eef25 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/Make.defs +++ b/boards/arm/stm32/stm32ldiscovery/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/stm32vldiscovery/src/Make.defs b/boards/arm/stm32/stm32vldiscovery/src/Make.defs index 24da6c8..f29afec 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/Make.defs +++ b/boards/arm/stm32/stm32vldiscovery/src/Make.defs @@ -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) diff --git a/boards/arm/stm32/viewtool-stm32f107/src/Make.defs b/boards/arm/stm32/viewtool-stm32f107/src/Make.defs index 1900662..9a46540 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/Make.defs +++ b/boards/arm/stm32/viewtool-stm32f107/src/Make.defs @@ -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) diff --git a/drivers/1wire/Make.defs b/drivers/1wire/Make.defs index a730cba..3734314 100644 --- a/drivers/1wire/Make.defs +++ b/drivers/1wire/Make.defs @@ -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 diff --git a/drivers/Makefile b/drivers/Makefile index c1fe761..0ea2988 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -36,10 +36,6 @@ -include $(TOPDIR)/Make.defs DELIM ?= $(strip /) -ifeq ($(CONFIG_CYGWIN_WINTOOL),y) -INCDIROPT = -w -endif - DEPPATH = --dep-path . ASRCS = CSRCS = diff --git a/drivers/analog/Make.defs b/drivers/analog/Make.defs index c2494df..a47f1c4 100644 --- a/drivers/analog/Make.defs +++ b/drivers/analog/Make.defs @@ -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 diff --git a/drivers/bch/Make.defs b/drivers/bch/Make.defs index e10e41e..72a52de 100644 --- a/drivers/bch/Make.defs +++ b/drivers/bch/Make.defs @@ -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 diff --git a/drivers/can/Make.defs b/drivers/can/Make.defs index 158fba8..b341bf2 100644 --- a/drivers/can/Make.defs +++ b/drivers/can/Make.defs @@ -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 diff --git a/drivers/contactless/Make.defs b/drivers/contactless/Make.defs index 0df7134..d918b15 100644 --- a/drivers/contactless/Make.defs +++ b/drivers/contactless/Make.defs @@ -49,5 +49,5 @@ endif DEPPATH += --dep-path contactless VPATH += :contactless -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)contactless} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)contactless} endif diff --git a/drivers/crypto/Make.defs b/drivers/crypto/Make.defs index 135f271..89862c8 100644 --- a/drivers/crypto/Make.defs +++ b/drivers/crypto/Make.defs @@ -43,4 +43,4 @@ endif DEPPATH += --dep-path crypto VPATH += :crypto -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)crypto} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)crypto} diff --git a/drivers/i2c/Make.defs b/drivers/i2c/Make.defs index 5bdf115..5aeefc8 100644 --- a/drivers/i2c/Make.defs +++ b/drivers/i2c/Make.defs @@ -54,6 +54,6 @@ endif DEPPATH += --dep-path i2c VPATH += :i2c -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)i2c} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)i2c} endif # CONFIG_I2C diff --git a/drivers/input/Make.defs b/drivers/input/Make.defs index 1f92089..f35830f 100644 --- a/drivers/input/Make.defs +++ b/drivers/input/Make.defs @@ -103,5 +103,5 @@ endif DEPPATH += --dep-path input VPATH += :input -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)input} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)input} endif diff --git a/drivers/ioexpander/Make.defs b/drivers/ioexpander/Make.defs index 3d2b1f0..080fea7 100644 --- a/drivers/ioexpander/Make.defs +++ b/drivers/ioexpander/Make.defs @@ -75,7 +75,7 @@ ifeq ($(CONFIG_IOEXPANDER),y) DEPPATH += --dep-path ioexpander VPATH += :ioexpander -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander} else ifeq ($(CONFIG_DEV_GPIO),y) @@ -83,6 +83,6 @@ else ifeq ($(CONFIG_DEV_GPIO),y) DEPPATH += --dep-path ioexpander VPATH += :ioexpander -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander} endif diff --git a/drivers/lcd/Make.defs b/drivers/lcd/Make.defs index f5a4c16..ae4e59d 100644 --- a/drivers/lcd/Make.defs +++ b/drivers/lcd/Make.defs @@ -157,13 +157,13 @@ endif ifeq ($(CONFIG_LCD),y) DEPPATH += --dep-path lcd VPATH += :lcd - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} + CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} else ifeq ($(CONFIG_SLCD),y) DEPPATH += --dep-path lcd VPATH += :lcd - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} + CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} else ifeq ($(CONFIG_LCD_OTHER),y) DEPPATH += --dep-path lcd VPATH += :lcd - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} + CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} endif diff --git a/drivers/loop/Make.defs b/drivers/loop/Make.defs index a7c9336..d4725cf 100644 --- a/drivers/loop/Make.defs +++ b/drivers/loop/Make.defs @@ -49,6 +49,6 @@ CSRCS += losetup.c DEPPATH += --dep-path loop VPATH += :loop -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)loop} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)loop} endif diff --git a/drivers/mmcsd/Make.defs b/drivers/mmcsd/Make.defs index c5a67b1..67b5f58 100644 --- a/drivers/mmcsd/Make.defs +++ b/drivers/mmcsd/Make.defs @@ -49,6 +49,6 @@ endif DEPPATH += --dep-path mmcsd VPATH += :mmcsd -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd} endif diff --git a/drivers/modem/Make.defs b/drivers/modem/Make.defs index 3b406f6..ad2215e 100644 --- a/drivers/modem/Make.defs +++ b/drivers/modem/Make.defs @@ -45,6 +45,6 @@ include modem$(DELIM)altair$(DELIM)Make.defs DEPPATH += --dep-path modem VPATH += :modem -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem} endif diff --git a/drivers/modem/altair/Make.defs b/drivers/modem/altair/Make.defs index d24feb6..a6cdbde 100644 --- a/drivers/modem/altair/Make.defs +++ b/drivers/modem/altair/Make.defs @@ -45,6 +45,6 @@ endif DEPPATH += --dep-path modem$(DELIM)altair VPATH += :modem$(DELIM)altair -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem} endif diff --git a/drivers/power/Make.defs b/drivers/power/Make.defs index 9280884..74ebe5d 100644 --- a/drivers/power/Make.defs +++ b/drivers/power/Make.defs @@ -62,7 +62,7 @@ endif POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -74,7 +74,7 @@ CSRCS += smps.c POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -86,7 +86,7 @@ CSRCS += powerled.c POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -98,7 +98,7 @@ CSRCS += motor.c POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -136,7 +136,7 @@ endif POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -162,7 +162,7 @@ endif POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -188,7 +188,7 @@ endif POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} +POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif diff --git a/drivers/rptun/Make.defs b/drivers/rptun/Make.defs index 17c4953..5a00c48 100644 --- a/drivers/rptun/Make.defs +++ b/drivers/rptun/Make.defs @@ -41,5 +41,5 @@ CSRCS += rptun.c DEPPATH += --dep-path rptun VPATH += :rptun -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun} endif diff --git a/drivers/sensors/Make.defs b/drivers/sensors/Make.defs index bf730ef..a92d9f9 100644 --- a/drivers/sensors/Make.defs +++ b/drivers/sensors/Make.defs @@ -301,6 +301,6 @@ endif DEPPATH += --dep-path sensors VPATH += :sensors -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)sensors} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)sensors} endif # CONFIG_SENSORS diff --git a/drivers/spi/Make.defs b/drivers/spi/Make.defs index e489bd6..5ea290d 100644 --- a/drivers/spi/Make.defs +++ b/drivers/spi/Make.defs @@ -54,5 +54,5 @@ endif DEPPATH += --dep-path spi VPATH += :spi -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)spi} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)spi} endif diff --git a/drivers/usbdev/Make.defs b/drivers/usbdev/Make.defs index c38de6a..dd2fb5a 100644 --- a/drivers/usbdev/Make.defs +++ b/drivers/usbdev/Make.defs @@ -75,5 +75,5 @@ CSRCS += usbdev_trace.c usbdev_trprintf.c DEPPATH += --dep-path usbdev VPATH += :usbdev -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev} endif diff --git a/drivers/usbhost/Make.defs b/drivers/usbhost/Make.defs index cfad073..cf058a1 100644 --- a/drivers/usbhost/Make.defs +++ b/drivers/usbhost/Make.defs @@ -89,4 +89,4 @@ endif DEPPATH += --dep-path usbhost VPATH += :usbhost -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbhost} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbhost} diff --git a/drivers/usbmisc/Make.defs b/drivers/usbmisc/Make.defs index a3d6a57..9ac7506 100644 --- a/drivers/usbmisc/Make.defs +++ b/drivers/usbmisc/Make.defs @@ -49,5 +49,5 @@ endif DEPPATH += --dep-path usbmisc VPATH += :usbmisc -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc} endif diff --git a/drivers/usbmonitor/Make.defs b/drivers/usbmonitor/Make.defs index c6664b0..811db06 100644 --- a/drivers/usbmonitor/Make.defs +++ b/drivers/usbmonitor/Make.defs @@ -45,6 +45,6 @@ CSRCS += usbmonitor.c DEPPATH += --dep-path usbmonitor VPATH += :usbmonitor -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor} endif diff --git a/drivers/video/Make.defs b/drivers/video/Make.defs index 82ac7ee..91203f2 100644 --- a/drivers/video/Make.defs +++ b/drivers/video/Make.defs @@ -69,6 +69,6 @@ endif DEPPATH += --dep-path video VPATH += :video -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video} endif diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs index ecb1971..7b30e60 100644 --- a/drivers/wireless/Make.defs +++ b/drivers/wireless/Make.defs @@ -82,5 +82,5 @@ endif DEPPATH += --dep-path wireless VPATH += :wireless -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless} endif diff --git a/drivers/wireless/bluetooth/Make.defs b/drivers/wireless/bluetooth/Make.defs index 728eaae..4eb538e 100644 --- a/drivers/wireless/bluetooth/Make.defs +++ b/drivers/wireless/bluetooth/Make.defs @@ -63,6 +63,6 @@ endif DEPPATH += --dep-path wireless$(DELIM)bluetooth VPATH += :wireless$(DELIM)bluetooth -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth} endif # CONFIG_DRIVERS_BLUETOOTH diff --git a/drivers/wireless/ieee80211/bcm43xxx/Make.defs b/drivers/wireless/ieee80211/bcm43xxx/Make.defs index ef2a757..28a9996 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/Make.defs +++ b/drivers/wireless/ieee80211/bcm43xxx/Make.defs @@ -60,6 +60,6 @@ endif DEPPATH += --dep-path wireless$(DELIM)ieee80211$(DELIM)bcm43xxx VPATH += :wireless$(DELIM)ieee80211$(DELIM)bcm43xxx -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee80211$(DELIM)bcm43xxx} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee80211$(DELIM)bcm43xxx} endif # CONFIG_IEEE80211_BROADCOM_FULLMAC diff --git a/drivers/wireless/ieee802154/Make.defs b/drivers/wireless/ieee802154/Make.defs index cd898cd..3eaa91c 100644 --- a/drivers/wireless/ieee802154/Make.defs +++ b/drivers/wireless/ieee802154/Make.defs @@ -49,6 +49,6 @@ include wireless$(DELIM)ieee802154$(DELIM)xbee$(DELIM)Make.defs DEPPATH += --dep-path wireless$(DELIM)ieee802154 VPATH += :wireless$(DELIM)ieee802154 -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154} endif # CONFIG_DRIVERS_IEEE802154 diff --git a/drivers/wireless/ieee802154/at86rf23x/Make.defs b/drivers/wireless/ieee802154/at86rf23x/Make.defs index d52943e..aeecf1b 100644 --- a/drivers/wireless/ieee802154/at86rf23x/Make.defs +++ b/drivers/wireless/ieee802154/at86rf23x/Make.defs @@ -43,6 +43,6 @@ CSRCS += at86rf23x.c DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)at86rf23x VPATH += :wireless$(DELIM)ieee802154$(DELIM)at86rf23x -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)at86rf23x} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)at86rf23x} endif # CONFIG_IEEE802154_AT86RF233 diff --git a/drivers/wireless/ieee802154/mrf24j40/Make.defs b/drivers/wireless/ieee802154/mrf24j40/Make.defs index 1040d42..04c06ec 100644 --- a/drivers/wireless/ieee802154/mrf24j40/Make.defs +++ b/drivers/wireless/ieee802154/mrf24j40/Make.defs @@ -44,6 +44,6 @@ CSRCS += mrf24j40_regops.c mrf24j40.c DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)mrf24j40 VPATH += :wireless$(DELIM)ieee802154$(DELIM)mrf24j40 -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)mrf24j40} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)mrf24j40} endif # CONFIG_IEEE802154_MRF24J40 diff --git a/drivers/wireless/ieee802154/xbee/Make.defs b/drivers/wireless/ieee802154/xbee/Make.defs index d4e7371..ca4a68c 100644 --- a/drivers/wireless/ieee802154/xbee/Make.defs +++ b/drivers/wireless/ieee802154/xbee/Make.defs @@ -43,6 +43,6 @@ CSRCS += xbee_ioctl.c xbee_mac.c xbee_netdev.c xbee.c DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)xbee VPATH += :wireless$(DELIM)ieee802154$(DELIM)xbee -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)xbee} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)xbee} endif # CONFIG_IEEE802154_XBEE diff --git a/drivers/wireless/lpwan/sx127x/Make.defs b/drivers/wireless/lpwan/sx127x/Make.defs index 90c24cb..a52dd2d 100644 --- a/drivers/wireless/lpwan/sx127x/Make.defs +++ b/drivers/wireless/lpwan/sx127x/Make.defs @@ -43,6 +43,6 @@ CSRCS += sx127x.c DEPPATH += --dep-path wireless$(DELIM)lpwan$(DELIM)sx127x VPATH += :wireless$(DELIM)lpwan$(DELIM)sx127x -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x} endif # CONFIG_LPWAN_SX127X diff --git a/drivers/wireless/spirit/drivers/Make.defs b/drivers/wireless/spirit/drivers/Make.defs index 723309e..70ded12 100644 --- a/drivers/wireless/spirit/drivers/Make.defs +++ b/drivers/wireless/spirit/drivers/Make.defs @@ -43,7 +43,7 @@ CSRCS += spirit_netdev.c DEPPATH += --dep-path wireless$(DELIM)spirit$(DELIM)drivers VPATH += :wireless$(DELIM)spirit$(DELIM)drivers -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \ +CFLAGS += ${shell $(INCDIR) "$(CC)" \ $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)drivers} endif # CONFIG_SPIRIT_NETDEV diff --git a/drivers/wireless/spirit/include/Make.defs b/drivers/wireless/spirit/include/Make.defs index b4091f8..ed36427 100644 --- a/drivers/wireless/spirit/include/Make.defs +++ b/drivers/wireless/spirit/include/Make.defs @@ -35,5 +35,5 @@ # Add path to include Spirit header files in CFLAGS -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \ +CFLAGS += ${shell $(INCDIR) "$(CC)" \ $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)include} diff --git a/fs/spiffs/Make.defs b/fs/spiffs/Make.defs index b02efb4..f376968 100644 --- a/fs/spiffs/Make.defs +++ b/fs/spiffs/Make.defs @@ -44,6 +44,6 @@ CSRCS += spiffs_cache.c spiffs_check.c spiffs_mtd.c DEPPATH += --dep-path spiffs/src VPATH += :spiffs/src -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src} endif diff --git a/graphics/Makefile b/graphics/Makefile index 0602964..2a66e68 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -38,10 +38,6 @@ DEPPATH = --dep-path . -ifeq ($(CONFIG_CYGWIN_WINTOOL),y) -INCDIROPT = -w -endif - ASRCS = CSRCS = VPATH = diff --git a/graphics/nxbe/Make.defs b/graphics/nxbe/Make.defs index fb3efd4..e6f9ff7 100644 --- a/graphics/nxbe/Make.defs +++ b/graphics/nxbe/Make.defs @@ -51,5 +51,5 @@ CSRCS += nxbe_cursor.c endif DEPPATH += --dep-path nxbe -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxbe} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxbe} VPATH += :nxbe diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs index ff9132d..2750214 100644 --- a/graphics/nxglib/Make.defs +++ b/graphics/nxglib/Make.defs @@ -111,5 +111,6 @@ CSRCS += nxglib_cursor_backup_24bpp.c nxglib_cursor_backup_32bpp.c endif DEPPATH += --dep-path nxglib -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxglib} +#VPATH += :nxglib VPATH = nxglib diff --git a/graphics/nxmu/Make.defs b/graphics/nxmu/Make.defs index c47aede..f53107f 100644 --- a/graphics/nxmu/Make.defs +++ b/graphics/nxmu/Make.defs @@ -39,5 +39,5 @@ CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c CSRCS += nxmu_start.c DEPPATH += --dep-path nxmu -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxmu} VPATH += :nxmu diff --git a/graphics/nxterm/Make.defs b/graphics/nxterm/Make.defs index 58d78ed..a05f0ad 100644 --- a/graphics/nxterm/Make.defs +++ b/graphics/nxterm/Make.defs @@ -52,7 +52,7 @@ CSRCS += nxterm_sem.c endif DEPPATH += --dep-path nxterm -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxterm} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxterm} VPATH += :nxterm endif diff --git a/graphics/vnc/client/Make.defs b/graphics/vnc/client/Make.defs index 03d6f5b..ef0c098 100644 --- a/graphics/vnc/client/Make.defs +++ b/graphics/vnc/client/Make.defs @@ -36,7 +36,7 @@ ifeq ($(CONFIG_VNCCLIENT),y) DEPPATH += --dep-path vnc/client -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/client} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/client} VPATH += :vnc/client endif diff --git a/graphics/vnc/server/Make.defs b/graphics/vnc/server/Make.defs index a0ebad9..a472b18 100644 --- a/graphics/vnc/server/Make.defs +++ b/graphics/vnc/server/Make.defs @@ -43,7 +43,7 @@ CSRCS += vnc_keymap.c endif DEPPATH += --dep-path vnc/server -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/server} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/server} VPATH += :vnc/server endif diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile index bd0f6bd..81c760c 100644 --- a/libs/libc/zoneinfo/Makefile +++ b/libs/libc/zoneinfo/Makefile @@ -36,10 +36,6 @@ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs -ifeq ($(CONFIG_CYGWIN_WINTOOL),y) -INCDIROPT = -w -endif - # Zoneinfo database ASRCS = diff --git a/mm/iob/Make.defs b/mm/iob/Make.defs index a2747ba..384dc63 100644 --- a/mm/iob/Make.defs +++ b/mm/iob/Make.defs @@ -56,6 +56,6 @@ endif DEPPATH += --dep-path iob VPATH += :iob -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)mm$(DELIM)iob} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)mm$(DELIM)iob} endif # CONFIG_MM_IOB diff --git a/pass1/Makefile b/pass1/Makefile index 49e0456..530b244 100644 --- a/pass1/Makefile +++ b/pass1/Makefile @@ -36,10 +36,6 @@ -include $(TOPDIR)/Make.defs DELIM ?= $(strip /) -ifeq ($(CONFIG_CYGWIN_WINTOOL),y) -INCDIROPT = -w -endif - DEPPATH = --dep-path . ASRCS = $(wildcard *.S) diff --git a/tools/Config.mk b/tools/Config.mk index f96c40e..e9cd6bc 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -100,6 +100,9 @@ endif ifeq ($(CONFIG_WINDOWS_NATIVE),y) DEFINE = "$(TOPDIR)\tools\define.bat" INCDIR = "$(TOPDIR)\tools\incdir.bat" +else ifeq ($(CONFIG_CYGWIN_WINTOOL),y) + DEFINE = "$(TOPDIR)/tools/define.sh" + INCDIR = "$(TOPDIR)/tools/incdir.sh" -w else DEFINE = "$(TOPDIR)/tools/define.sh" INCDIR = "$(TOPDIR)/tools/incdir.sh" diff --git a/wireless/Makefile b/wireless/Makefile index 7dc9bb5..254e449 100644 --- a/wireless/Makefile +++ b/wireless/Makefile @@ -36,10 +36,6 @@ -include $(TOPDIR)/Make.defs DELIM ?= $(strip /) -ifeq ($(CONFIG_CYGWIN_WINTOOL),y) -INCDIROPT = -w -endif - # Add files to the build DEPPATH = --dep-path . diff --git a/wireless/bluetooth/Make.defs b/wireless/bluetooth/Make.defs index 3618ecf..8ca7edf 100644 --- a/wireless/bluetooth/Make.defs +++ b/wireless/bluetooth/Make.defs @@ -43,6 +43,6 @@ CSRCS += bt_uuid.c DEPPATH += --dep-path bluetooth VPATH += :bluetooth -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth} endif # CONFIG_WIRELESS_BLUETOOTH diff --git a/wireless/ieee802154/Make.defs b/wireless/ieee802154/Make.defs index 7de9c47..e63ac1b 100644 --- a/wireless/ieee802154/Make.defs +++ b/wireless/ieee802154/Make.defs @@ -66,6 +66,6 @@ endif DEPPATH += --dep-path ieee802154 VPATH += :ieee802154 -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154} endif # CONFIG_WIRELESS_IEEE802154 diff --git a/wireless/pktradio/Make.defs b/wireless/pktradio/Make.defs index c73e5f1..7edf8b9 100644 --- a/wireless/pktradio/Make.defs +++ b/wireless/pktradio/Make.defs @@ -45,6 +45,6 @@ endif DEPPATH += --dep-path pktradio VPATH += :pktradio -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio} +CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio} endif # CONFIG_WIRELESS_PKTRADIO
