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

Fix makefile local.mk usage

Browse source
This commit is contained in:
Angus Gratton 2015-06-03 09:14:50 +10:00
parent 4790654bc2
commit 1bfe1c5147
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common.mk
View file

@ -14,6 +14,11 @@
# https://github.com/tuanpmt/esp_mqtt, but it has changed significantly # https://github.com/tuanpmt/esp_mqtt, but it has changed significantly
# since then. # since then.
# #
# assume the 'root' directory (ie top of the tree) is the directory common.mk is in
ROOT := $(dir $(lastword $(MAKEFILE_LIST)))
# include local overrides (if present) at top level, then in program directory
-include $(ROOT)local.mk
-include local.mk -include local.mk
ifndef TARGET ifndef TARGET
@ -88,9 +93,6 @@ space := $(empty) $(empty)
# assume the target_dir is the directory the top-level makefile was run in # assume the target_dir is the directory the top-level makefile was run in
TARGET_DIR := $(dir $(firstword $(MAKEFILE_LIST))) TARGET_DIR := $(dir $(firstword $(MAKEFILE_LIST)))
# assume the 'root' directory (ie top of the tree) is the directory common.mk is in
ROOT := $(dir $(lastword $(MAKEFILE_LIST)))
# derive various parts of compiler/linker arguments # derive various parts of compiler/linker arguments
SDK_LIB_ARGS = $(addprefix -l,$(SDK_LIBS)) SDK_LIB_ARGS = $(addprefix -l,$(SDK_LIBS))
LIB_ARGS = $(addprefix -l,$(LIBS)) LIB_ARGS = $(addprefix -l,$(LIBS))