diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ChangeLog.txt | 5 | ||||
| -rw-r--r-- | apps/Makefile | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 2d7b2eb9f..0e63d183e 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -353,3 +353,8 @@ * vsn: Moved all NSH commands from vsn/ to system/. Deleted the vsn/ directory. + * Makefile: Change order of includes when CONFIG_NEWCONFIG=y. In + that case, namedapp must be included first so that the namedapp + context is established first. If the namedapp context is established + later, it will overwrite any existing namedapp_list.h and nameapp_proto.h + files. diff --git a/apps/Makefile b/apps/Makefile index d2b0ecdab..e407e2de8 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -46,7 +46,7 @@ APPDIR = ${shell pwd} # appears in this directory as .config) # SUBDIRS is the list of all directories containing Makefiles. It is used # only for cleaning. namedapp must always be the first in the list. This -# list can be extended by the .config file as well +# list can be extended by the .config file as well. CONFIGURED_APPS = SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system @@ -70,11 +70,13 @@ SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system ifeq ($(CONFIG_NUTTX_NEWCONFIG),y) +# namedapp/Make.defs must be included first + +include namedapp/Make.defs include examples/Make.defs include graphics/Make.defs include interpreters/Make.defs include modbus/Make.defs -include namedapp/Make.defs include netutils/Make.defs include nshlib/Make.defs include system/Make.defs |