diff options
| author | px4dev <px4@purgatory.org> | 2012-10-13 00:08:02 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-10-13 00:08:02 -0700 |
| commit | 0ccaa1330bf0bcb6fd7ab6b966470f8e2f6c4275 (patch) | |
| tree | de4f04aac9a97274d706d564fc61e798ac1033ab /apps/Makefile | |
| parent | d62ec78ab835153ef3ba480a5a4110465ba34372 (diff) | |
| parent | e4ccbe7508fd31b76790986fc654dc588efb9dfe (diff) | |
| download | px4-firmware-0ccaa1330bf0bcb6fd7ab6b966470f8e2f6c4275.tar.gz px4-firmware-0ccaa1330bf0bcb6fd7ab6b966470f8e2f6c4275.tar.bz2 px4-firmware-0ccaa1330bf0bcb6fd7ab6b966470f8e2f6c4275.zip | |
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
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile index f087b7c33..19ad1c18b 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -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 |