diff options
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/apps/Makefile b/apps/Makefile index bc0959106..3be4a1d99 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -42,8 +42,7 @@ APPDIR = ${shell pwd} # Application Directories # CONFIGURED_APPS is the list of all configured built-in directories/built -# action. It is created by the configured appconfig file (a copy of which -# appears in this directory as .config) +# action. # SUBDIRS is the list of all directories containing Makefiles. It is used # only for cleaning. builtin must always be the first in the list. This # list can be extended by the .config file as well. @@ -52,25 +51,16 @@ CONFIGURED_APPS = SUBDIRS = examples graphics interpreters modbus builtin nshlib netutils SUBDIRS += platform system -# There are two different mechanisms for obtaining the list of configured -# directories: +# The list of configured directories is derived from NuttX configuration +# file: The selected applications are enabled settings in the confuration +# file. For example, # -# (1) In the legacy method, these paths are all provided in the appconfig -# file that is copied to the top-level apps/ directory as .config -# (2) With the development of the NuttX configuration tool, however, the -# selected applications are now enabled by the configuration tool. -# The apps/.config file is no longer used. Instead, the set of -# configured build directories can be found by including a Make.defs -# file contained in each of the apps/subdirectories. +# CONFIG_EXAMPLES_HELLO=y # -# When the NuttX configuration tools executes, it will always define the -# configure CONFIG_NUTTX_NEWCONFIG to select between these two cases. Then -# legacy appconfig files will still work but newly configuration files will -# also work. Eventually the CONFIG_NUTTX_NEWCONFIG option will be phased +# Will cause the "Hello, World!" example at apps/examples/hello to be +# built and added int libapps.a. # out. -ifeq ($(CONFIG_NUTTX_NEWCONFIG),y) - # builtin/Make.defs must be included first include builtin/Make.defs @@ -91,19 +81,6 @@ include system/Make.defs INSTALLED_APPS = -# The legacy case: - -else --include .config - -# INSTALLED_APPS is the list of currently available application directories. It -# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent -# application directory. builtin is always in the list of applications to be -# built. - -INSTALLED_APPS = builtin -endif - # Create the list of available applications (INSTALLED_APPS) define ADD_BUILTIN @@ -181,7 +158,6 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y) $(Q) for %%G in ($(SUBDIRS)) do ( \ $(MAKE) -C %%G distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" \ ) - $(call DELFILE, .config) $(call DELFILE, .depend) $(Q) ( if exist external ( \ echo ********************************************************" \ @@ -192,7 +168,6 @@ else $(Q) for dir in $(SUBDIRS) ; do \ $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done - $(call DELFILE, .config) $(call DELFILE, .depend) $(Q) ( if [ -e external ]; then \ echo "********************************************************"; \ |