Merge branch 'master' of bitbucket.org:nuttx/apps

This commit is contained in:
Gregory Nutt 2018-09-07 05:26:54 -06:00
commit 49f2d90dcf
2 changed files with 3 additions and 1 deletions

View File

@ -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)),)

View File

@ -110,7 +110,7 @@ echo "" >>$outfile
echo "#if defined(CONFIG_EXECFUNCS_HAVE_SYMTAB)" >>$outfile
echo "const int CONFIG_EXECFUNCS_NSYMBOLS_VAR = sizeof(CONFIG_EXECFUNCS_SYMTAB_ARRAY) / sizeof(struct symtab_s);" >>$outfile
echo "#elif defined(CONFIG_SYSTEM_NSH_SYMTAB)" >>$outfile
echo "const int CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME = sizeof(CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME) / sizeof(struct symtab_s);" >>$outfile
echo "const int CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME = sizeof(CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME) / sizeof(struct symtab_s);" >>$outfile
echo "#else" >>$outfile
echo "const int dummy_nsymtabs = sizeof(dummy_symtab) / sizeof(struct symtab_s);" >>$outfile
echo "#endif" >>$outfile