From 32b9837373e0e164e1cf9fc459ee5a6b63f93a27 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 30 Mar 2019 10:47:48 +0000 Subject: [PATCH] defs.mk, mcu-exe.mk: Code beautification Signed-off-by: Jan Lindemann --- make/defs.mk | 2 +- make/mcu-exe.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 62ed9329..4955b23d 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -135,7 +135,7 @@ define install_links done; endef -define uniq = +define uniq = $(eval seen :=) $(foreach _,$1,$(if $(filter $_,${seen}),,$(eval seen += $_))) ${seen} diff --git a/make/mcu-exe.mk b/make/mcu-exe.mk index 4fdeeea7..dde54ffa 100644 --- a/make/mcu-exe.mk +++ b/make/mcu-exe.mk @@ -11,6 +11,11 @@ endif MCU_FLASH_PUSH_FILE_HEX ?= $(patsubst %.elf,%.hex,$(EXE_BASENAME)) EXE_MAP ?= $(patsubst %.elf,%.map,$(EXE_BASENAME)) +# I think these (or something equivalent) should go somewhere here. Not cleaned +# up enough in modm builds to do it. +#include $(MODDIR)/make/defs.mk +#include $(MODDIR)/make/defs-cpp.mk + include $(MODDIR)/make/mcu-defs.mk include $(MODDIR)/make/exe.mk include $(MODDIR)/make/mcu-flash.mk