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

build: Don't need use $(DELIM) in include statement

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-05-21 01:11:16 +08:00 committed by patacongo
parent 2e9a1b0962
commit edb0ce2d5a
38 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/Makefile
View File

@ -35,7 +35,7 @@
############################################################################
include $(TOPDIR)/Make.defs
include chip$(DELIM)Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_ARMV7A),y) # ARMv7-A
ARCH_SUBDIR = armv7-a

4
arch/arm/src/s32k1xx/Make.defs
View File

@ -97,9 +97,9 @@ endif
# Source files specific to the ARM CPU family and to the S32K1xx chip family
ifeq ($(CONFIG_ARCH_CHIP_S32K11X),y)
include s32k1xx$(DELIM)s32k11x$(DELIM)Make.defs
include s32k1xx/s32k11x/Make.defs
else
include s32k1xx$(DELIM)s32k14x$(DELIM)Make.defs
include s32k1xx/s32k14x/Make.defs
endif
# Make sure that the S32K1 common directory in included in the VPATH

2
arch/or1k/src/Makefile
View File

@ -34,7 +34,7 @@
############################################################################
include $(TOPDIR)/Make.defs
include chip$(DELIM)Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_MOR1KX),y) # OpenRISC mor1kx
ARCH_SUBDIR = mor1kx

4
binfmt/Makefile
View File

@ -63,8 +63,8 @@ VPATH =
SUBDIRS =
DEPPATH = --dep-path .
include libnxflat$(DELIM)Make.defs
include libelf$(DELIM)Make.defs
include libnxflat/Make.defs
include libelf/Make.defs
BINFMT_AOBJS = $(BINFMT_ASRCS:.S=$(OBJEXT))
BINFMT_COBJS = $(BINFMT_CSRCS:.c=$(OBJEXT))

2
boards/arm/a1x/pcduino-a10/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
LDSCRIPT = sdram.ld

4
boards/arm/cxd56xx/common/Makefile
View File

@ -34,8 +34,8 @@
include $(TOPDIR)/Make.defs
include board$(DELIM)Make.defs
include src$(DELIM)Make.defs
include board/Make.defs
include src/Make.defs
DEPPATH += --dep-path board
DEPPATH += --dep-path src

6
boards/arm/cxd56xx/drivers/Make.defs
View File

@ -33,6 +33,6 @@
#
############################################################################
include platform$(DELIM)audio$(DELIM)Make.defs
include platform$(DELIM)sensors$(DELIM)Make.defs
include platform$(DELIM)camera$(DELIM)Make.defs
include platform/audio/Make.defs
include platform/sensors/Make.defs
include platform/camera/Make.defs

2
boards/arm/imx6/sabre-6quad/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
LDSCRIPT = dramboot.ld

2
boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
# Setup for the kind of memory that we are executing from

2
boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs
View File

@ -40,7 +40,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs
View File

@ -41,7 +41,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/sama5/sama5d2-xult/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
LDSCRIPT = isram.ld

2
boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
LDSCRIPT = isram.ld

2
boards/arm/sama5/sama5d3x-ek/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
LDSCRIPT = isram.ld

2
boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
LDSCRIPT = isram.ld

2
boards/arm/sama5/sama5d4-ek/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs
ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
LDSCRIPT = isram.ld

4
boards/arm/stm32/common/Makefile
View File

@ -20,8 +20,8 @@
include $(TOPDIR)/Make.defs
include board$(DELIM)Make.defs
include src$(DELIM)Make.defs
include board/Make.defs
include src/Make.defs
DEPPATH += --dep-path board
DEPPATH += --dep-path src

2
boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains

2
boards/arm/tms570/launchxl-tms57004/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-r$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-r/Toolchain.defs
LDSCRIPT = flash-sram.ld

2
boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs
View File

@ -35,7 +35,7 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-r$(DELIM)Toolchain.defs
include $(TOPDIR)/arch/arm/src/armv7-r/Toolchain.defs
LDSCRIPT = flash-sram.ld

70
drivers/Makefile
View File

@ -44,43 +44,43 @@ VPATH = .
# files to the source file list, add its DEPPATH info, and will add
# the appropriate paths to the VPATH variable
include analog$(DELIM)Make.defs
include audio$(DELIM)Make.defs
include bch$(DELIM)Make.defs
include can$(DELIM)Make.defs
include crypto$(DELIM)Make.defs
include i2c$(DELIM)Make.defs
include i2s$(DELIM)Make.defs
include input$(DELIM)Make.defs
include ioexpander$(DELIM)Make.defs
include lcd$(DELIM)Make.defs
include leds$(DELIM)Make.defs
include loop$(DELIM)Make.defs
include mmcsd$(DELIM)Make.defs
include modem$(DELIM)Make.defs
include mtd$(DELIM)Make.defs
include eeprom$(DELIM)Make.defs
include net$(DELIM)Make.defs
include pipes$(DELIM)Make.defs
include power$(DELIM)Make.defs
include rptun$(DELIM)Make.defs
include sensors$(DELIM)Make.defs
include serial$(DELIM)Make.defs
include spi$(DELIM)Make.defs
include syslog$(DELIM)Make.defs
include timers$(DELIM)Make.defs
include usbdev$(DELIM)Make.defs
include usbhost$(DELIM)Make.defs
include usbmisc$(DELIM)Make.defs
include usbmonitor$(DELIM)Make.defs
include video$(DELIM)Make.defs
include wireless$(DELIM)Make.defs
include contactless$(DELIM)Make.defs
include 1wire$(DELIM)Make.defs
include rf$(DELIM)Make.defs
include analog/Make.defs
include audio/Make.defs
include bch/Make.defs
include can/Make.defs
include crypto/Make.defs
include i2c/Make.defs
include i2s/Make.defs
include input/Make.defs
include ioexpander/Make.defs
include lcd/Make.defs
include leds/Make.defs
include loop/Make.defs
include mmcsd/Make.defs
include modem/Make.defs
include mtd/Make.defs
include eeprom/Make.defs
include net/Make.defs
include pipes/Make.defs
include power/Make.defs
include rptun/Make.defs
include sensors/Make.defs
include serial/Make.defs
include spi/Make.defs
include syslog/Make.defs
include timers/Make.defs
include usbdev/Make.defs
include usbhost/Make.defs
include usbmisc/Make.defs
include usbmonitor/Make.defs
include video/Make.defs
include wireless/Make.defs
include contactless/Make.defs
include 1wire/Make.defs
include rf/Make.defs
ifeq ($(CONFIG_SPECIFIC_DRIVERS),y)
include platform$(DELIM)Make.defs
include platform/Make.defs
endif
ifeq ($(CONFIG_DEV_SIMPLE_ADDRENV),y)

2
drivers/modem/Make.defs
View File

@ -39,7 +39,7 @@ ifeq ($(CONFIG_MODEM_U_BLOX),y)
CSRCS += u-blox.c
endif
include modem$(DELIM)altair$(DELIM)Make.defs
include modem/altair/Make.defs
# Include modem driver build support

10
drivers/wireless/Make.defs
View File

@ -38,25 +38,25 @@ ifeq ($(CONFIG_DRIVERS_WIRELESS),y)
# Include IEEE 802.15.4 support
ifeq ($(CONFIG_DRIVERS_IEEE802154),y)
include wireless$(DELIM)ieee802154$(DELIM)Make.defs
include wireless/ieee802154/Make.defs
endif
# Include IEEE 802.11 support
ifeq ($(CONFIG_DRIVERS_IEEE80211),y)
include wireless$(DELIM)ieee80211$(DELIM)Make.defs
include wireless/ieee80211/Make.defs
endif
# Include Bluetooth support
ifeq ($(CONFIG_DRIVERS_BLUETOOTH),y)
include wireless$(DELIM)bluetooth$(DELIM)Make.defs
include wireless/bluetooth/Make.defs
endif
# Include LPWAN support
ifeq ($(CONFIG_DRIVERS_LPWAN),y)
include wireless$(DELIM)lpwan$(DELIM)Make.defs
include wireless/lpwan/Make.defs
endif
# Include wireless drivers
@ -71,7 +71,7 @@ CSRCS += gs2200m.c
endif
ifeq ($(CONFIG_WL_SPIRIT),y)
include wireless$(DELIM)spirit$(DELIM)Make.defs
include wireless/spirit/Make.defs
endif
ifeq ($(CONFIG_WL_NRF24L01),y)

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

@ -40,6 +40,6 @@ ifeq ($(CONFIG_DRIVERS_IEEE80211),y)
# Include IEEE 802.11 drivers into the build
include wireless$(DELIM)ieee80211$(DELIM)bcm43xxx$(DELIM)Make.defs
include wireless/ieee80211/bcm43xxx/Make.defs
endif # CONFIG_DRIVERS_IEEE80211

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

@ -41,9 +41,9 @@ ifeq ($(CONFIG_DRIVERS_IEEE802154),y)
# Include IEEE 802.15.4 drivers into the build
include wireless$(DELIM)ieee802154$(DELIM)mrf24j40$(DELIM)Make.defs
include wireless$(DELIM)ieee802154$(DELIM)at86rf23x$(DELIM)Make.defs
include wireless$(DELIM)ieee802154$(DELIM)xbee$(DELIM)Make.defs
include wireless/ieee802154/mrf24j40/Make.defs
include wireless/ieee802154/at86rf23x/Make.defs
include wireless/ieee802154/xbee/Make.defs
# Include common IEEE 802.15.4 build support

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

@ -37,6 +37,6 @@
ifeq ($(CONFIG_DRIVERS_LPWAN),y)
include wireless$(DELIM)lpwan$(DELIM)sx127x$(DELIM)Make.defs
include wireless/lpwan/sx127x/Make.defs
endif # CONFIG_DRIVERS_LPWAN

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

@ -37,8 +37,8 @@ ifeq ($(CONFIG_WL_SPIRIT),y)
# Include Spirit library support
include wireless$(DELIM)spirit$(DELIM)lib$(DELIM)Make.defs
include wireless$(DELIM)spirit$(DELIM)include$(DELIM)Make.defs
include wireless$(DELIM)spirit$(DELIM)drivers$(DELIM)Make.defs
include wireless/spirit/lib/Make.defs
include wireless/spirit/include/Make.defs
include wireless/spirit/drivers/Make.defs
endif

4
syscall/Makefile
View File

@ -35,8 +35,8 @@
include $(TOPDIR)/Make.defs
include proxies$(DELIM)Make.defs
include stubs$(DELIM)Make.defs
include proxies/Make.defs
include stubs/Make.defs
MKSYSCALL = "$(TOPDIR)$(DELIM)tools$(DELIM)mksyscall$(HOSTEXEEXT)"
CSVFILE = "$(TOPDIR)$(DELIM)syscall$(DELIM)syscall.csv"

6
wireless/Makefile
View File

@ -45,9 +45,9 @@ VPATH = .
# Add IEEE 802.15.4 files to the build
include bluetooth$(DELIM)Make.defs
include ieee802154$(DELIM)Make.defs
include pktradio$(DELIM)Make.defs
include bluetooth/Make.defs
include ieee802154/Make.defs
include pktradio/Make.defs
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))