diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-21 21:59:35 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-21 21:59:35 +0000 |
commit | aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2 (patch) | |
tree | 2ee3d56220eb419976035ac38aa73dc8f5e249b8 /apps | |
parent | 60051cba0cf424e01ef2eda09816ee8945867b6d (diff) | |
download | nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.gz nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.bz2 nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.zip |
Prep for 6.0 releasenuttx-6.0
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3408 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 6 | ||||
-rw-r--r-- | apps/examples/nsh/nsh_main.c | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/apps/Makefile b/apps/Makefile index be7b9f6be..5c4e8dc09 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -52,8 +52,6 @@ SUBDIRS = nuttapp nshlib netutils examples vsn BUILTIN_APPS_BUILT = nuttapp/.built_always BUILTIN_APPS_DIR = nuttapp -ifeq ($(CONFIG_BUILTIN_APPS),y) - # 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 # directoy as .config) @@ -86,10 +84,6 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_AVAILABLE,$(BUILTIN)))) $(foreach APP, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_APP,$(APP)))) $(foreach BUILT, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_BUILT,$(BUILT)))) -# end of application list - -endif - # The final build target BIN = libapps$(LIBEXT) diff --git a/apps/examples/nsh/nsh_main.c b/apps/examples/nsh/nsh_main.c index 6f63308b4..1bd09e8a3 100644 --- a/apps/examples/nsh/nsh_main.c +++ b/apps/examples/nsh/nsh_main.c @@ -51,11 +51,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_BUILTIN_APPS -# warning "This example requires CONFIG_BUILTIN_APPS..." -# warning " You must have an appconfig file in your config directory to use this example" -#endif - /**************************************************************************** * Private Types ****************************************************************************/ |