From a0d71b94386f014bdeff6be77b7444438f867bbd Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 16 Jan 2013 21:38:00 +0000
Subject: convert configs/sim/nsh to use kconfig-frontends

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5526 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/examples/Makefile       | 8 +++-----
 apps/examples/README.txt     | 2 +-
 apps/examples/hello/Makefile | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index a11dbf240..939748075 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -57,13 +57,11 @@ SUBDIRS += usbserial sendmail usbstorage usbterm watchdog wget wgetjson
 CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover ftpd json keypadtest
-CNTXTDIRS += modbus nettest nxlines relays qencoder telnetd watchdog wgetjson
+CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover ftpd hello json
+CNTXTDIRS += keypadtestmodbus nettest nxlines relays qencoder telnetd watchdog
+CNTXTDIRS += wgetjson
 endif
 
-ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y)
-CNTXTDIRS += hello
-endif
 ifeq ($(CONFIG_EXAMPLES_HELLOXX_BUILTIN),y)
 CNTXTDIRS += helloxx
 endif
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 5c6332ee3..5996cbb70 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -491,7 +491,7 @@ examples/hello
   than examples/null with a single printf statement.  Really useful only
   for bringing up new NuttX architectures.
 
-  * CONFIG_EXAMPLES_HELLO_BUILTIN
+  * CONFIG_NSH_BUILTIN_APPS
     Build the "Hello, World" example as an NSH built-in application.
 
 examples/helloxx
diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index fc98fa7f4..c3b9744d7 100644
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
-ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y)
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
-- 
cgit v1.2.3