Revision a7e67622

View differences:

Makefile
89 89
OS_BASE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
90 90

  
91 91
help:
92
	@echo "$$HELP_TEXT"
92
	$(info $(HELP_TEXT))
93 93
	@exit
94 94

  
95
include $(OS_BASE_DIR)/os/modules/Makefile
95
include $(OS_BASE_DIR)/modules/Makefile
modules/DiWheelDrive_1-1/Makefile
116 116
PROJECT := $(patsubst $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))..)/%,%,$(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
117 117

  
118 118
# Imported source files and paths
119
include ../../../kernel/kernel.mk
119
include ../../kernel/kernel.mk
120 120
CHIBIOS := $(AMIROOS_KERNEL)
121
AMIROOS = ../..
121
AMIROOS = ../../os
122 122
# Startup files
123 123
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
124 124
# HAL-OSAL files
......
134 134
# Other files (optional).
135 135
include $(CHIBIOS)/test/rt/test.mk
136 136
# AMiRo-BLT files
137
include ../../../bootloader/bootloader.mk
137
include ../../bootloader/bootloader.mk
138 138
# AMiRo-LLD files
139
include ../../../periphery-lld/periphery-lld.mk
139
include ../../periphery-lld/periphery-lld.mk
140 140
# AMiRo-OS files
141
include $(AMIROOS)/modules/modules.mk
141
include ../modules.mk
142 142
include $(AMIROOS)/core/core.mk
143 143
include $(AMIROOS)/unittests/unittests.mk
144 144

  
......
300 300
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
301 301
include $(RULESPATH)/rules.mk
302 302

  
303
include $(AMIROOS)/modules/flash.mk
303
include ../flash.mk
modules/LightRing_1-0/Makefile
116 116
PROJECT := $(patsubst $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))..)/%,%,$(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
117 117

  
118 118
# Imported source files and paths
119
include ../../../kernel/kernel.mk
119
include ../../kernel/kernel.mk
120 120
CHIBIOS := $(AMIROOS_KERNEL)
121
AMIROOS = ../..
121
AMIROOS = ../../os
122 122
# Startup files
123 123
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
124 124
# HAL-OSAL files
......
134 134
# Other files (optional).
135 135
include $(CHIBIOS)/test/rt/test.mk
136 136
# AMiRo-BLT files
137
include ../../../bootloader/bootloader.mk
137
include ../../bootloader/bootloader.mk
138 138
# AMiRo-LLD files
139
include ../../../periphery-lld/periphery-lld.mk
139
include ../../periphery-lld/periphery-lld.mk
140 140
# AMiRo-OS files
141
include $(AMIROOS)/modules/modules.mk
141
include ../modules.mk
142 142
include $(AMIROOS)/core/core.mk
143 143
include $(AMIROOS)/unittests/unittests.mk
144 144

  
......
300 300
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
301 301
include $(RULESPATH)/rules.mk
302 302

  
303
include $(AMIROOS)/modules/flash.mk
303
include ../flash.mk
modules/PowerManagement_1-1/Makefile
116 116
PROJECT := $(patsubst $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))..)/%,%,$(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
117 117

  
118 118
# Imported source files and paths
119
include ../../../kernel/kernel.mk
119
include ../../kernel/kernel.mk
120 120
CHIBIOS := $(AMIROOS_KERNEL)
121
AMIROOS = ../..
121
AMIROOS = ../../os
122 122
# Startup files
123 123
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
124 124
# HAL-OSAL files
......
134 134
# Other files (optional).
135 135
include $(CHIBIOS)/test/rt/test.mk
136 136
# AMiRo-BLT files
137
include ../../../bootloader/bootloader.mk
137
include ../../bootloader/bootloader.mk
138 138
# AMiRo-LLD files
139
include ../../../periphery-lld/periphery-lld.mk
139
include ../../periphery-lld/periphery-lld.mk
140 140
# AMiRo-OS files
141
include $(AMIROOS)/modules/modules.mk
141
include ../modules.mk
142 142
include $(AMIROOS)/core/core.mk
143 143
include $(AMIROOS)/unittests/unittests.mk
144 144

  
......
300 300
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
301 301
include $(RULESPATH)/rules.mk
302 302

  
303
include $(AMIROOS)/modules/flash.mk
303
include ../flash.mk
modules/flash.mk
26 26
# the path to this makefile
27 27
FLASH_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
28 28

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

  
31 31
# the files to flash
32 32
ifdef PROJECT
modules/modules.mk
33 33
MODULESINC = $(MODULES_DIR)
34 34

  
35 35
# C source files
36
MODULESCSRC = $(MODULES_DIR)
36
MODULESCSRC =
37 37

  

Also available in: Unified diff