luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Makefile: move INCDIROPT to common place (#625)"

Browse source 
This reverts commit b9ace36fcc.

This change was added by PR 625 but has a serious logic flaw.  It removes all occurrences of INCDIROPT and replaces it with a definition in tools/Config.mk:

    else ifeq ($(WINTOOL),y)
      DEFINE = "$(TOPDIR)/tools/define.sh"
      INCDIR = "$(TOPDIR)/tools/incdir.sh" -w

This logic flaw is the Config.mk is included in all Make.defs files BEFORE WINTOOL is defined.  As a result, the definition is wrong in many places when building under Cygwin with a Windows native toolchain.
This commit is contained in:
Gregory Nutt 2020-03-26 08:51:07 -06:00 • committed by Brennan Ashton
parent b9ace36fcc
commit 5c0e8e88b1
57 changed files with 89 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio/Makefile
View file

@ -36,6 +36,10 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
DELIM ?= $(strip /) DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
DEPPATH = --dep-path . DEPPATH = --dep-path .
ASRCS = ASRCS =
CSRCS = audio.c CSRCS = audio.c

5
binfmt/Makefile
View file

@ -37,7 +37,10 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
DELIM ?= $(strip /) DELIM ?= $(strip /)
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(TOPDIR)$(DELIM)sched"} ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(TOPDIR)$(DELIM)sched"}
# Basic BINFMT source files # Basic BINFMT source files

2
boards/arm/cxd56xx/common/src/Make.defs
View file

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

2
boards/arm/cxd56xx/drivers/audio/Make.defs
View file

@ -53,4 +53,4 @@ endif
DEPPATH += --dep-path platform$(DELIM)audio DEPPATH += --dep-path platform$(DELIM)audio
VPATH += :platform$(DELIM)audio VPATH += :platform$(DELIM)audio
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)audio) CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)audio)

2
boards/arm/cxd56xx/drivers/camera/Make.defs
View file

@ -24,4 +24,4 @@ endif
DEPPATH += --dep-path platform$(DELIM)camera DEPPATH += --dep-path platform$(DELIM)camera
VPATH += :platform$(DELIM)camera VPATH += :platform$(DELIM)camera
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)camera) CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)camera)

2
boards/arm/cxd56xx/drivers/sensors/Make.defs
View file

@ -79,4 +79,4 @@ endif
DEPPATH += --dep-path platform$(DELIM)sensors DEPPATH += --dep-path platform$(DELIM)sensors
VPATH += :platform$(DELIM)sensors VPATH += :platform$(DELIM)sensors
CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors) CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors)

2
boards/arm/cxd56xx/spresense/src/Make.defs
View file

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

2
drivers/1wire/Make.defs
View file

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

4
drivers/Makefile
View file

@ -36,6 +36,10 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
DELIM ?= $(strip /) DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
DEPPATH = --dep-path . DEPPATH = --dep-path .
ASRCS = ASRCS =
CSRCS = CSRCS =

8
drivers/analog/Make.defs
View file

@ -121,22 +121,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
endif endif
endif endif
endif endif

2
drivers/bch/Make.defs
View file

@ -45,6 +45,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch}
endif endif

2
drivers/can/Make.defs
View file

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

2
drivers/contactless/Make.defs
View file

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

2
drivers/crypto/Make.defs
View file

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

2
drivers/i2c/Make.defs
View file

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

2
drivers/input/Make.defs
View file

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

4
drivers/ioexpander/Make.defs
View file

@ -75,7 +75,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
else ifeq ($(CONFIG_DEV_GPIO),y) else ifeq ($(CONFIG_DEV_GPIO),y)
@ -83,6 +83,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
endif endif

6
drivers/lcd/Make.defs
View file

@ -157,13 +157,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
endif endif

2
drivers/loop/Make.defs
View file

@ -49,6 +49,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)loop}
endif endif

2
drivers/mmcsd/Make.defs
View file

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

2
drivers/modem/Make.defs
View file

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

2
drivers/modem/altair/Make.defs
View file

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

14
drivers/power/Make.defs
View file

@ -62,7 +62,7 @@ endif
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif
@ -74,7 +74,7 @@ CSRCS += smps.c
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif
@ -86,7 +86,7 @@ CSRCS += powerled.c
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif
@ -98,7 +98,7 @@ CSRCS += motor.c
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif
@ -136,7 +136,7 @@ endif
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif
@ -162,7 +162,7 @@ endif
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif
@ -188,7 +188,7 @@ endif
POWER_DEPPATH := --dep-path power POWER_DEPPATH := --dep-path power
POWER_VPATH := :power POWER_VPATH := :power
POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif endif

2
drivers/rptun/Make.defs
View file

@ -41,5 +41,5 @@ CSRCS += rptun.c
DEPPATH += --dep-path rptun DEPPATH += --dep-path rptun
VPATH += :rptun VPATH += :rptun
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun}
endif endif

2
drivers/sensors/Make.defs
View file

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

2
drivers/spi/Make.defs
View file

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

2
drivers/usbdev/Make.defs
View file

@ -75,5 +75,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev}
endif endif

2
drivers/usbhost/Make.defs
View file

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

2
drivers/usbmisc/Make.defs
View file

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

2
drivers/usbmonitor/Make.defs
View file

@ -45,6 +45,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor}
endif endif

2
drivers/video/Make.defs
View file

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

2
drivers/wireless/Make.defs
View file

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

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

@ -63,6 +63,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth}
endif # CONFIG_DRIVERS_BLUETOOTH endif # CONFIG_DRIVERS_BLUETOOTH

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

@ -60,6 +60,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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

@ -49,6 +49,6 @@ include wireless$(DELIM)ieee802154$(DELIM)xbee$(DELIM)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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154}
endif # CONFIG_DRIVERS_IEEE802154 endif # CONFIG_DRIVERS_IEEE802154

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

@ -43,6 +43,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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

@ -44,6 +44,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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

@ -43,6 +43,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(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

@ -43,6 +43,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x}
endif # CONFIG_LPWAN_SX127X endif # CONFIG_LPWAN_SX127X

2
drivers/wireless/spirit/drivers/Make.defs
View file

@ -43,7 +43,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
$(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

2
drivers/wireless/spirit/include/Make.defs
View file

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

2
fs/spiffs/Make.defs
View file

@ -44,6 +44,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src}
endif endif

4
graphics/Makefile
View file

@ -38,6 +38,10 @@
DEPPATH = --dep-path . DEPPATH = --dep-path .
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
ASRCS = ASRCS =
CSRCS = CSRCS =
VPATH = VPATH =

2
graphics/nxbe/Make.defs
View file

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

2
graphics/nxglib/Make.defs
View file

@ -111,6 +111,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib}
#VPATH += :nxglib #VPATH += :nxglib
VPATH = nxglib VPATH = nxglib

2
graphics/nxmu/Make.defs
View file

@ -39,5 +39,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 += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu}
VPATH += :nxmu VPATH += :nxmu

2
graphics/nxterm/Make.defs
View file

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

2
graphics/vnc/client/Make.defs
View file

@ -36,7 +36,7 @@
ifeq ($(CONFIG_VNCCLIENT),y) ifeq ($(CONFIG_VNCCLIENT),y)
DEPPATH += --dep-path vnc/client DEPPATH += --dep-path vnc/client
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/client} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/client}
VPATH += :vnc/client VPATH += :vnc/client
endif endif

2
graphics/vnc/server/Make.defs
View file

@ -43,7 +43,7 @@ CSRCS += vnc_keymap.c
endif endif
DEPPATH += --dep-path vnc/server DEPPATH += --dep-path vnc/server
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/server} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/server}
VPATH += :vnc/server VPATH += :vnc/server
endif endif

4
libs/libc/zoneinfo/Makefile
View file

@ -36,6 +36,10 @@
-include $(TOPDIR)/.config -include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Zoneinfo database # Zoneinfo database
ASRCS = ASRCS =

2
mm/iob/Make.defs
View file

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

4
pass1/Makefile
View file

@ -36,6 +36,10 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
DELIM ?= $(strip /) DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
DEPPATH = --dep-path . DEPPATH = --dep-path .
ASRCS = $(wildcard *.S) ASRCS = $(wildcard *.S)

3
tools/Config.mk
View file

@ -95,9 +95,6 @@ endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
DEFINE = "$(TOPDIR)\tools\define.bat" DEFINE = "$(TOPDIR)\tools\define.bat"
INCDIR = "$(TOPDIR)\tools\incdir.bat" INCDIR = "$(TOPDIR)\tools\incdir.bat"
else ifeq ($(WINTOOL),y)
DEFINE = "$(TOPDIR)/tools/define.sh"
INCDIR = "$(TOPDIR)/tools/incdir.sh" -w
else else
DEFINE = "$(TOPDIR)/tools/define.sh" DEFINE = "$(TOPDIR)/tools/define.sh"
INCDIR = "$(TOPDIR)/tools/incdir.sh" INCDIR = "$(TOPDIR)/tools/incdir.sh"

4
wireless/Makefile
View file

@ -36,6 +36,10 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
DELIM ?= $(strip /) DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Add files to the build # Add files to the build
DEPPATH = --dep-path . DEPPATH = --dep-path .

2
wireless/bluetooth/Make.defs
View file

@ -43,6 +43,6 @@ CSRCS += bt_uuid.c
DEPPATH += --dep-path bluetooth DEPPATH += --dep-path bluetooth
VPATH += :bluetooth VPATH += :bluetooth
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth}
endif # CONFIG_WIRELESS_BLUETOOTH endif # CONFIG_WIRELESS_BLUETOOTH

2
wireless/ieee802154/Make.defs
View file

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

2
wireless/pktradio/Make.defs
View file

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