mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
Change order of includes in apps/Makefile; add clock frequencies to shenzhou, fire, and olimex-stm32 board.h files
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5210 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
a9cf4e3050
commit
b8d2846a7e
2 changed files with 9 additions and 2 deletions
|
|
@ -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.
|
||||
|
|
|
|||
6
Makefile
6
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue