From ef60f7f69789f41baf2cd25416b8517540f31326 Mon Sep 17 00:00:00 2001 From: Masayuki Ishikawa Date: Fri, 7 Sep 2018 11:25:09 +0000 Subject: [PATCH] Merged in masayuki2009/nuttx.apps/fix_builtin_apps (pull request #155) Application.mk: Fix to not register a builtin app when BUILD_MODULE=y Signed-off-by: Masayuki Ishikawa Approved-by: GregoryN --- Application.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application.mk b/Application.mk index 93854933a..75afee55e 100644 --- a/Application.mk +++ b/Application.mk @@ -207,6 +207,7 @@ endif # BUILD_MODULE preconfig:: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +ifneq ($(BUILD_MODULE),y) REGLIST := $(addprefix $(BUILTIN_REGISTRY)$(DELIM),$(APPNAME)_main.bdat) APPLIST := $(APPNAME) @@ -232,6 +233,7 @@ endif else context:: endif +endif .depend: Makefile $(SRCS) ifeq ($(filter %$(CXXEXT),$(SRCS)),)