From 9424be584c788992d25c359d23939679c5b64533 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Mon, 25 Mar 2013 16:35:20 +0200 Subject: [PATCH] Makefile: fix MODULE_MODULENAME_BUILTIN generation bug for revo modules This converts 'ModuleName/revolution' into 'ModuleName' for macro. +review OPReview-422 --- make/apps-defs.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make/apps-defs.mk b/make/apps-defs.mk index fa368084d..3e2c86b37 100644 --- a/make/apps-defs.mk +++ b/make/apps-defs.mk @@ -106,7 +106,8 @@ SRC += $(foreach mod, $(OPTMODULES), $(wildcard $(OPMODULEDIR)/$(mod)/*.c)) # Declare all non-optional modules as built-in to force inclusion. # Built-in modules are always enabled and cannot be disabled. -MODULES_BUILTIN := $(foreach mod, $(notdir $(MODULES)), -DMODULE_$(shell $(ECHO) $(mod) | tr '[:lower:]' '[:upper:]')_BUILTIN) +MODNAMES := $(notdir $(subst /revolution,,$(MODULES))) +MODULES_BUILTIN := $(foreach mod, $(MODNAMES), -DMODULE_$(shell $(ECHO) $(mod) | tr '[:lower:]' '[:upper:]')_BUILTIN) CDEFS += $(MODULES_BUILTIN) # List C source files here which must be compiled in ARM-Mode (no -mthumb).