mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-24 15:43:34 +08:00
Merge branch 'master' of file:///Users/Shared/NuttX
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5231 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
+5
-4
@@ -46,10 +46,10 @@ 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 vsn
|
||||
#SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system
|
||||
ALL_SUBDIRS = $(dir $(shell /usr/bin/find . -name Makefile))
|
||||
SUBDIRS = namedapp/ $(filter-out ./ ./namedapp/ ./examples/,$(ALL_SUBDIRS))
|
||||
|
||||
@@ -73,15 +73,16 @@ SUBDIRS = namedapp/ $(filter-out ./ ./namedapp/ ./examples/,$(ALL_SUBDIRS))
|
||||
|
||||
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
|
||||
-include vsn/Make.defs
|
||||
|
||||
# INSTALLED_APPS is the list of currently available application directories. It
|
||||
# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent
|
||||
|
||||
Reference in New Issue
Block a user