j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rework component makefiles to have a default <component>_ROOT

Browse source 
This fixes a long-standing bug where build directories sometimes
expanded many levels deeper than they should have.

Component names can now no longer contains slashes (ie the component
name for 'extras/i2c' is now just 'i2c')
This commit is contained in:
Angus Gratton 2015-09-08 09:59:59 +10:00
parent ed2c1ad713
commit 7e73693898
8 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
extras/bmp180/component.mk
View file

@ -1,9 +1,9 @@
# Component makefile for extras/bmp180
INC_DIRS += $(ROOT)extras
# expected anyone using bmp driver includes it as 'bmp180/bmp180.h'
INC_DIRS += $(bmp180_ROOT)..
# args for passing into compile rule generation
extras/bmp180_INC_DIR = $(ROOT)extras
extras/bmp180_SRC_DIR = $(ROOT)extras/bmp180
bmp180_SRC_DIR = $(bmp180_ROOT)
$(eval $(call component_compile_rules,extras/bmp180))
$(eval $(call component_compile_rules,bmp180))

9
extras/i2c/component.mk
View file

@ -1,9 +1,10 @@
# Component makefile for extras/i2c
INC_DIRS += $(ROOT)extras
# expected anyone using i2c driver includes it as 'i2c/i2c.h'
INC_DIRS += $(i2c_ROOT)..
# args for passing into compile rule generation
extras/i2c_INC_DIR = $(ROOT)extras
extras/i2c_SRC_DIR = $(ROOT)extras/i2c
i2c_INC_DIR =
i2c_SRC_DIR = $(i2c_ROOT)
$(eval $(call component_compile_rules,extras/i2c))
$(eval $(call component_compile_rules,i2c))

8
extras/rboot-ota/component.mk
View file

@ -1,9 +1,9 @@
# Component makefile for extras/rboot-ota
INC_DIRS += $(ROOT)extras/rboot-ota
INC_DIRS += $(rboot-ota_ROOT)
# args for passing into compile rule generation
extras/rboot-ota_INC_DIR = $(ROOT)extras/rboot-ota
extras/rboot-ota_SRC_DIR = $(ROOT)extras/rboot-ota
rboot-ota_SRC_DIR = $(rboot-ota_ROOT)
$(eval $(call component_compile_rules,rboot-ota))
$(eval $(call component_compile_rules,extras/rboot-ota))