Revision 870f74ac

View differences:

Makefile
85 85
endef
86 86
export HELP_TEXT
87 87

  
88
OS_BASE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
88
OS_BASE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
89 89

  
90 90
help:
91 91
	@echo "$$HELP_TEXT"
bootloader/AMiRo-BLT
1
Subproject commit 7737db33518f9c1d6a4fa958976038fb2dc766a5
1
Subproject commit 9ed9243fd517981d98d60a266f762b8b60d650b5
bootloader/bootloader.mk
24 24

  
25 25

  
26 26
# the path to this makefile
27
BOOTLOADER_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
BOOTLOADER_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# the interface for the bootloader
30 30
BOOTLOADERINC = $(BOOTLOADER_DIR)AMiRo-BLT/Target/Source/AMiRo
os/core/core.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
AMIROOS_CORE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
AMIROOS_CORE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# include paths
30
AMIROOSCOREINC = $(AMIROOS_CORE_DIR)inc/
30
AMIROOSCOREINC = $(AMIROOS_CORE_DIR)inc
31 31

  
32 32
# C source files
33 33
AMIROOSCORECSRC = $(AMIROOS_CORE_DIR)src/aos_debug.c \
os/hal/hal.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
HAL_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
HAL_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# add include path
30 30
HALINC += $(HAL_DIR)include
os/hal/ports/STM32/platform.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
PLATFORM_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
PLATFORM_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# add include path
30
PLATFORMINC += $(PLATFORM_DIR)LLD/QEIv1/
30
PLATFORMINC += $(PLATFORM_DIR)LLD/QEIv1
31 31

  
32 32
# add C sources
33 33
PLATFORMSRC += $(PLATFORM_DIR)LLD/QEIv1/hal_qei_lld.c
os/modules/DiWheelDrive_1-1/Makefile
35 35

  
36 36
# C specific options here (added to USE_OPT).
37 37
ifeq ($(USE_COPT),)
38
  USE_COPT = -std=c99
38
  USE_COPT = -std=c11
39 39
endif
40 40

  
41 41
# C++ specific options here (added to USE_OPT).
42 42
ifeq ($(USE_CPPOPT),)
43
  USE_CPPOPT = -fno-rtti -std=c++14
43
  USE_CPPOPT = -fno-rtti -std=c++17
44 44
endif
45 45

  
46 46
# Enable this if you want the linker to remove unused code and data
......
290 290
# End of user defines                                                          #
291 291
################################################################################
292 292

  
293
# allow for custom build directory
294
ifneq ($(BUILDDIR),)
295
  BUILDDIR := $(BUILDDIR)/$(PROJECT)
296
endif
297

  
293 298
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
294 299
include $(RULESPATH)/rules.mk
295 300

  
os/modules/DiWheelDrive_1-1/board.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
BOARD_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
BOARD_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# include paths
30 30
BOARDINC = $(BOARD_DIR)
os/modules/LightRing_1-0/Makefile
35 35

  
36 36
# C specific options here (added to USE_OPT).
37 37
ifeq ($(USE_COPT),)
38
  USE_COPT = -std=c99
38
  USE_COPT = -std=c11
39 39
endif
40 40

  
41 41
# C++ specific options here (added to USE_OPT).
42 42
ifeq ($(USE_CPPOPT),)
43
  USE_CPPOPT = -fno-rtti -std=c++14
43
  USE_CPPOPT = -fno-rtti -std=c++17
44 44
endif
45 45

  
46 46
# Enable this if you want the linker to remove unused code and data
......
290 290
# End of user defines                                                          #
291 291
################################################################################
292 292

  
293
# allow for custom build directory
294
ifneq ($(BUILDDIR),)
295
  BUILDDIR := $(BUILDDIR)/$(PROJECT)
296
endif
297

  
293 298
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
294 299
include $(RULESPATH)/rules.mk
295 300

  
os/modules/LightRing_1-0/board.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
BOARD_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
BOARD_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# include paths
30 30
BOARDINC = $(BOARD_DIR)
os/modules/Makefile
23 23

  
24 24

  
25 25

  
26
all: modules
26
include $(dir $(lastword $(MAKEFILE_LIST)))modules.mk
27 27

  
28
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))modules.mk
28
.PHONY: all $(MODULES) flash clean
29

  
30
ifneq ($(BUILDDIR),)
31
  export BUILDDIR
32
endif
29 33

  
30 34
CLEANTRGS = $(MODULES:%=clean_%)
31 35
FLASHTRGS = $(MODULES:%=flash_%)
32 36

  
33
.PHONY: $(MODULES)
34

  
35
modules: $(MODULES)
37
all: $(MODULES)
36 38
$(MODULES):
37 39
	$(MAKE) -C $(MODULES_DIR)$@
38 40

  
os/modules/PowerManagement_1-1/Makefile
35 35

  
36 36
# C specific options here (added to USE_OPT).
37 37
ifeq ($(USE_COPT),)
38
  USE_COPT = -std=c99
38
  USE_COPT = -std=c11
39 39
endif
40 40

  
41 41
# C++ specific options here (added to USE_OPT).
42 42
ifeq ($(USE_CPPOPT),)
43
  USE_CPPOPT = -fno-rtti -std=c++14
43
  USE_CPPOPT = -fno-rtti -std=c++17
44 44
endif
45 45

  
46 46
# Enable this if you want the linker to remove unused code and data
......
290 290
# End of user defines                                                          #
291 291
################################################################################
292 292

  
293
# allow for custom build directory
294
ifneq ($(BUILDDIR),)
295
  BUILDDIR := $(BUILDDIR)/$(PROJECT)
296
endif
297

  
293 298
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
294 299
include $(RULESPATH)/rules.mk
295 300

  
os/modules/PowerManagement_1-1/board.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
BOARD_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
BOARD_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# include paths
30 30
BOARDINC = $(BOARD_DIR)
os/modules/flash.mk
24 24

  
25 25

  
26 26
# the path to this makefile
27
FLASH_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
FLASH_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
include $(FLASH_DIR)../../bootloader/bootloader.mk
30 30

  
os/modules/modules.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
MODULES_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
MODULES_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# list of available modules
30
MODULES = $(patsubst $(MODULES_DIR)/%/,%,$(sort $(dir $(wildcard $(MODULES_DIR)/*/*))))
30
MODULES = $(patsubst $(MODULES_DIR)%/,%,$(sort $(dir $(wildcard $(MODULES_DIR)*/*))))
31 31

  
32 32
# include paths
33 33
MODULESINC = $(MODULES_DIR)
os/unittests/unittests.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
UNITTESTS_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
UNITTESTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
# include path
30 30
UNITTESTSINC = $(UNITTESTS_DIR)lld/inc \
periphery-lld/AMiRo-LLD
1
Subproject commit f0ca400f7e1927bfe400c6bcb32832633f673383
1
Subproject commit 616f3584eb15138e5cc926c59ade38798b1ccaa2
periphery-lld/periphery-lld.mk
24 24

  
25 25

  
26 26
# absolute path to this directory
27
PERIPHERYLLD_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
27
PERIPHERYLLD_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

  
29 29
include $(PERIPHERYLLD_DIR)AMiRo-LLD/Makefile
30 30

  
31 31
# include path
32 32
PERIPHERYLLDINC = $(AMIROLLD_INC) \
33
                  $(PERIPHERYLLD_DIR)
33
                  $(PERIPHERYLLD_DIR:/=)
34 34

  
35 35
# C sources
36 36
PERIPHERYLLDCSRC = $(AMIROLLD_CSRC)

Also available in: Unified diff