Merge branch 'recurse'

2016-06-06 07:36:31 -06:00 · 2016-06-06 07:36:31 -06:00 · 30fbf78f8d
commit 30fbf78f8d
parent 98a9769a28 ff8f65370e
176 changed files with 2216 additions and 700 deletions
--- a/Application.mk
+++ b/Application.mk
@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path .
 VPATH =

 all: .built
-.PHONY: clean depend distclean
+.PHONY: clean preconfig depend distclean

 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@ -103,6 +103,8 @@ else
 install:
 endif

+preconfig:
+
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 ifneq ($(APPNAME),)
 ifneq ($(PRIORITY),)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -1618,3 +1618,11 @@
 	  apps/fsutils/flash_eraseall (2016-06-04).
 	* apps/canutils/libuavcan: Fix for recent change to STM32 timer frequency
 	  definiitions (2016-06-05).
+	* Many files:  Change to the way that Kconfig files are generated in order
+	  to better support reuse of the apps/ directory in NuttX products.  Changes
+	  include: add kmenu files, make the full tree use wildcards make.defs, Add
+	  empty preconfig rules to 'leaf' makefiles, Use directory.mk for recursive
+	  dir makefiles, Individual app kconfig fixes, Recursive Kconfig
+	  autogeneration, Add kconfig files for pcode and tiff, and fix a gitignore
+	  rule,  From Sébastien Lorquet (2016-06-06).
+
--- a/Directory.mk
+++ b/Directory.mk
@ -34,6 +34,7 @@
 ############################################################################

 -include $(TOPDIR)/.config # Current configuration
+include $(APPDIR)/Make.defs

 # Sub-directories

@ -48,6 +49,7 @@ $(1)_$(2):
 	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 endef

+$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
@ -57,6 +59,9 @@ nothing:

 install:

+preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig)
+	$(MKKCONFIG) -m "$(shell cat Kmenu)"
+
 context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context)

 depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
--- a/Make.defs
+++ b/Make.defs
@ -53,3 +53,11 @@ define REGISTER
 	$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
 endef
 endif
+
+# Tools
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  MKKCONFIG = $(APPDIR)\tools\mkkconfig.bat
+else
+  MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
+endif
--- a/15
+++ b/15
@ -39,14 +39,7 @@ APPDIR = ${shell pwd}
 TOPDIR ?= $(APPDIR)/import

 -include $(TOPDIR)/Make.defs
-
-# Tools
-
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  MKKCONFIG = ${shell $(APPDIR)\tools\mkkconfig.bat}
-else
-  MKKCONFIG = ${shell $(APPDIR)/tools/mkkconfig.sh}
-endif
+-include $(APPDIR)/Make.defs

 # Application Directories

@ -90,6 +83,7 @@ $(1)_$(2):
 	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
 endef

+$(foreach SDIR, $(BUILDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig)))
 $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all)))
 $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),install)))
 $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),context)))
@ -119,11 +113,10 @@ context_serialize:

 context: context_serialize

-Kconfig: $(MKKCONFIG)
+preconfig:$(foreach SDIR, $(BUILDIRS), $(SDIR)_preconfig)
+	echo subdirs done
 	$(MKKCONFIG)

-preconfig: Kconfig
-
 .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend)

 .depend: context Makefile .depdirs
--- a/builtin/Makefile
+++ b/builtin/Makefile
@ -136,3 +136,5 @@ distclean: clean
 	$(call DELFILE, builtin_proto.h)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/canutils/.gitignore
+++ b/canutils/.gitignore
@ -0,0 +1,2 @@
+/Kconfig
+
--- a/canutils/Kconfig
+++ b/canutils/Kconfig
@ -1,11 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "CAN Utilities"
-
-source "$APPSDIR/canutils/libcanard/Kconfig"
-source "$APPSDIR/canutils/libuavcan/Kconfig"
-
-endmenu # CAN Utilities
--- a/canutils/Kmenu
+++ b/canutils/Kmenu
@ -0,0 +1 @@
+CAN Utilities
--- a/canutils/libcanard/Makefile
+++ b/canutils/libcanard/Makefile
@ -109,3 +109,5 @@ distclean: clean
 	$(call DELFILE, $(LIBCANARD_PACKNAME))

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/canutils/libuavcan/Makefile
+++ b/canutils/libuavcan/Makefile
@ -262,3 +262,5 @@ distclean: clean
 	$(call DELFILE, $(PYUAVCAN_PACKNAME))

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/.gitignore
+++ b/examples/.gitignore
@ -0,0 +1,2 @@
+/Kconfig
+
--- a/examples/Kconfig
+++ b/examples/Kconfig
@ -1,102 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "Examples"
-
-source "$APPSDIR/examples/adc/Kconfig"
-source "$APPSDIR/examples/ajoystick/Kconfig"
-source "$APPSDIR/examples/alarm/Kconfig"
-source "$APPSDIR/examples/bastest/Kconfig"
-source "$APPSDIR/examples/bridge/Kconfig"
-source "$APPSDIR/examples/buttons/Kconfig"
-source "$APPSDIR/examples/can/Kconfig"
-source "$APPSDIR/examples/cc3000/Kconfig"
-source "$APPSDIR/examples/chat/Kconfig"
-source "$APPSDIR/examples/configdata/Kconfig"
-source "$APPSDIR/examples/cpuhog/Kconfig"
-source "$APPSDIR/examples/cxxtest/Kconfig"
-source "$APPSDIR/examples/dhcpd/Kconfig"
-source "$APPSDIR/examples/djoystick/Kconfig"
-source "$APPSDIR/examples/elf/Kconfig"
-source "$APPSDIR/examples/fstest/Kconfig"
-source "$APPSDIR/examples/ftpc/Kconfig"
-source "$APPSDIR/examples/ftpd/Kconfig"
-source "$APPSDIR/examples/hello/Kconfig"
-source "$APPSDIR/examples/helloxx/Kconfig"
-source "$APPSDIR/examples/json/Kconfig"
-source "$APPSDIR/examples/hidkbd/Kconfig"
-source "$APPSDIR/examples/keypadtest/Kconfig"
-source "$APPSDIR/examples/igmp/Kconfig"
-source "$APPSDIR/examples/i2schar/Kconfig"
-source "$APPSDIR/examples/lcdrw/Kconfig"
-source "$APPSDIR/examples/leds/Kconfig"
-source "$APPSDIR/examples/ltdc/Kconfig"
-source "$APPSDIR/examples/media/Kconfig"
-source "$APPSDIR/examples/mm/Kconfig"
-source "$APPSDIR/examples/modbus/Kconfig"
-source "$APPSDIR/examples/module/Kconfig"
-source "$APPSDIR/examples/mount/Kconfig"
-source "$APPSDIR/examples/mtdpart/Kconfig"
-source "$APPSDIR/examples/mtdrwb/Kconfig"
-source "$APPSDIR/examples/netloop/Kconfig"
-source "$APPSDIR/examples/netpkt/Kconfig"
-source "$APPSDIR/examples/nettest/Kconfig"
-source "$APPSDIR/examples/nrf24l01_term/Kconfig"
-source "$APPSDIR/examples/nsh/Kconfig"
-source "$APPSDIR/examples/null/Kconfig"
-source "$APPSDIR/examples/nx/Kconfig"
-source "$APPSDIR/examples/nxterm/Kconfig"
-source "$APPSDIR/examples/nxffs/Kconfig"
-source "$APPSDIR/examples/nxflat/Kconfig"
-source "$APPSDIR/examples/nxhello/Kconfig"
-source "$APPSDIR/examples/nximage/Kconfig"
-source "$APPSDIR/examples/nxlines/Kconfig"
-source "$APPSDIR/examples/nxtext/Kconfig"
-source "$APPSDIR/examples/ostest/Kconfig"
-source "$APPSDIR/examples/pashello/Kconfig"
-source "$APPSDIR/examples/pca9635/Kconfig"
-source "$APPSDIR/examples/pipe/Kconfig"
-source "$APPSDIR/examples/poll/Kconfig"
-source "$APPSDIR/examples/pppd/Kconfig"
-source "$APPSDIR/examples/pwm/Kconfig"
-source "$APPSDIR/examples/posix_spawn/Kconfig"
-source "$APPSDIR/examples/qencoder/Kconfig"
-source "$APPSDIR/examples/random/Kconfig"
-source "$APPSDIR/examples/relays/Kconfig"
-source "$APPSDIR/examples/rgbled/Kconfig"
-source "$APPSDIR/examples/rgmp/Kconfig"
-source "$APPSDIR/examples/romfs/Kconfig"
-source "$APPSDIR/examples/sendmail/Kconfig"
-source "$APPSDIR/examples/serialblaster/Kconfig"
-source "$APPSDIR/examples/serialrx/Kconfig"
-source "$APPSDIR/examples/serloop/Kconfig"
-source "$APPSDIR/examples/slcd/Kconfig"
-source "$APPSDIR/examples/flash_test/Kconfig"
-source "$APPSDIR/examples/smart_test/Kconfig"
-source "$APPSDIR/examples/smart/Kconfig"
-source "$APPSDIR/examples/smp/Kconfig"
-source "$APPSDIR/examples/tcpecho/Kconfig"
-source "$APPSDIR/examples/telnetd/Kconfig"
-source "$APPSDIR/examples/thttpd/Kconfig"
-source "$APPSDIR/examples/timer/Kconfig"
-source "$APPSDIR/examples/tiff/Kconfig"
-source "$APPSDIR/examples/touchscreen/Kconfig"
-source "$APPSDIR/examples/uavcan/Kconfig"
-source "$APPSDIR/examples/udp/Kconfig"
-source "$APPSDIR/examples/udpblaster/Kconfig"
-source "$APPSDIR/examples/discover/Kconfig"
-source "$APPSDIR/examples/webserver/Kconfig"
-source "$APPSDIR/examples/unionfs/Kconfig"
-source "$APPSDIR/examples/usbserial/Kconfig"
-source "$APPSDIR/examples/usbterm/Kconfig"
-source "$APPSDIR/examples/udgram/Kconfig"
-source "$APPSDIR/examples/ustream/Kconfig"
-source "$APPSDIR/examples/watchdog/Kconfig"
-source "$APPSDIR/examples/wget/Kconfig"
-source "$APPSDIR/examples/wgetjson/Kconfig"
-source "$APPSDIR/examples/xmlrpc/Kconfig"
-source "$APPSDIR/examples/zerocross/Kconfig"
-
-endmenu # Examples
--- a/examples/Kmenu
+++ b/examples/Kmenu
@ -0,0 +1 @@
+Examples
--- a/examples/bastest/Makefile
+++ b/examples/bastest/Makefile
@ -157,3 +157,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/bridge/Makefile
+++ b/examples/bridge/Makefile
@ -166,3 +166,5 @@ distclean: clean
 	$(call DELFILE, bridge_config.h)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/cc3000/Makefile
+++ b/examples/cc3000/Makefile
@ -154,3 +154,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/chat/Makefile
+++ b/examples/chat/Makefile
@ -130,3 +130,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/elf/Makefile
+++ b/examples/elf/Makefile
@ -136,3 +136,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/ftpd/Makefile
+++ b/examples/ftpd/Makefile
@ -133,3 +133,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/module/Makefile
+++ b/examples/module/Makefile
@ -153,3 +153,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/nettest/Makefile
+++ b/examples/nettest/Makefile
@ -187,3 +187,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/nxflat/Makefile
+++ b/examples/nxflat/Makefile
@ -127,3 +127,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/poll/Makefile
+++ b/examples/poll/Makefile
@ -125,3 +125,5 @@ distclean: clean
 	$(call DELFILE, *.dSYM)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/posix_spawn/Makefile
+++ b/examples/posix_spawn/Makefile
@ -156,3 +156,5 @@ spawn_main.o: spawn_main.c \
 symtab.o: filesystem/symtab.c \
 	$(TOPDIR)/include/nuttx/compiler.h \
 	$(TOPDIR)/include/nuttx/binfmt/symtab.h
+.PHONY: preconfig
+preconfig:
--- a/examples/romfs/Makefile
+++ b/examples/romfs/Makefile
@ -153,3 +153,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/thttpd/Makefile
+++ b/examples/thttpd/Makefile
@ -137,3 +137,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/tiff/Makefile
+++ b/examples/tiff/Makefile
@ -138,3 +138,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/examples/udgram/Makefile
+++ b/examples/udgram/Makefile
@ -179,3 +179,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/udp/Makefile
+++ b/examples/udp/Makefile
@ -158,3 +158,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/udpblaster/Makefile
+++ b/examples/udpblaster/Makefile
@ -167,3 +167,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/unionfs/Makefile
+++ b/examples/unionfs/Makefile
@ -157,3 +157,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/usbserial/Makefile
+++ b/examples/usbserial/Makefile
@ -135,3 +135,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/ustream/Makefile
+++ b/examples/ustream/Makefile
@ -171,3 +171,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/examples/webserver/Makefile
+++ b/examples/webserver/Makefile
@ -140,3 +140,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/fsutils/.gitignore
+++ b/fsutils/.gitignore
@ -0,0 +1,2 @@
+/Kconfig
+
--- a/fsutils/Kconfig
+++ b/fsutils/Kconfig
@ -1,13 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "File System Utilities"
-
-source "$APPSDIR/fsutils/flash_eraseall/Kconfig"
-source "$APPSDIR/fsutils/inifile/Kconfig"
-source "$APPSDIR/fsutils/mksmartfs/Kconfig"
-source "$APPSDIR/fsutils/passwd/Kconfig"
-
-endmenu # FS Utilities
--- a/fsutils/Kmenu
+++ b/fsutils/Kmenu
@ -0,0 +1 @@
+File System Utilities
--- a/fsutils/inifile/Makefile
+++ b/fsutils/inifile/Makefile
@ -96,3 +96,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/fsutils/mksmartfs/Makefile
+++ b/fsutils/mksmartfs/Makefile
@ -102,3 +102,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/fsutils/passwd/Makefile
+++ b/fsutils/passwd/Makefile
@ -108,3 +108,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/gpsutils/.gitignore
+++ b/gpsutils/.gitignore
@ -0,0 +1,2 @@
+/Kconfig
+
--- a/gpsutils/Kconfig
+++ b/gpsutils/Kconfig
@ -1,10 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "GPS Utilities"
-
-source "$APPSDIR/gpsutils/minmea/Kconfig"
-
-endmenu # GPS Utilities
--- a/gpsutils/Kmenu
+++ b/gpsutils/Kmenu
@ -0,0 +1 @@
+GPS Utilities
--- a/gpsutils/minmea/Makefile
+++ b/gpsutils/minmea/Makefile
@ -97,3 +97,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/graphics/.gitignore
+++ b/graphics/.gitignore
@ -0,0 +1,2 @@
+/Kconfig
+
--- a/graphics/Kconfig
+++ b/graphics/Kconfig
@ -1,36 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "Graphics Support"
-
-config TIFF
-	bool "TIFF file generation library"
-	default n
-	---help---
-		Enable support for the TIFF file generation program.
-
-if TIFF
-
-menu "TIFF Screenshot Utility"
-source "$APPSDIR/graphics/screenshot/Kconfig"
-endmenu
-
-endif # TIFF
-
-config GRAPHICS_TRAVELER
-	bool "Traveler game"
-	default n
-	select FSUTILS_INIFILE
-	---help---
-		Enable or disable the graphic Traveler game
-
-if GRAPHICS_TRAVELER
-
-menu "Traveler game"
-source "$APPSDIR/graphics/traveler/Kconfig"
-endmenu
-
-endif # GRAPHICS_TRAVELER
-endmenu # Graphics Support
--- a/graphics/Kmenu
+++ b/graphics/Kmenu
@ -0,0 +1 @@
+Graphics Support
--- a/graphics/Make.defs
+++ b/graphics/Make.defs
@ -34,14 +34,4 @@
 #
 ############################################################################

-ifeq ($(CONFIG_TIFF),y)
-CONFIGURED_APPS += graphics/tiff
-endif
-
-ifeq ($(CONFIG_GRAPHICS_SCREENSHOT),y)
-CONFIGURED_APPS += graphics/screenshot
-endif
-
-ifeq ($(CONFIG_GRAPHICS_TRAVELER),y)
-CONFIGURED_APPS += graphics/traveler
-endif
+include $(wildcard graphics/*/Make.defs)
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -33,40 +33,4 @@
 #
 ############################################################################

-include $(TOPDIR)/.config
-
-# Sub-directories
-
-SUBDIRS = tiff screenshot traveler
-
-# Sub-directories that might need context setup
-
-CNTXTDIRS =
-
-all: nothing
-.PHONY: nothing context depend clean distclean
-
-define SDIR_template
-$(1)_$(2):
-	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-endef
-
-# $(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
-
-nothing:
-
-install:
-
-context: # $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context)
-
-depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
-
-clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
-
-distclean: clean $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
-
-include Make.dep
-
+include $(APPDIR)/Directory.mk
--- a/graphics/screenshot/Make.defs
+++ b/graphics/screenshot/Make.defs
@ -0,0 +1,39 @@
+############################################################################
+# apps/graphics/screenshot/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_GRAPHICS_SCREENSHOT),y)
+CONFIGURED_APPS += graphics/screenshot
+endif
--- a/graphics/screenshot/Makefile
+++ b/graphics/screenshot/Makefile
@ -139,3 +139,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/graphics/tiff/Kconfig
+++ b/graphics/tiff/Kconfig
@ -0,0 +1,9 @@
+config TIFF
+	bool "TIFF file generation library"
+	default n
+	---help---
+		Enable support for the TIFF file generation program.
+
+if TIFF
+endif # TIFF
+
--- a/graphics/tiff/Make.defs
+++ b/graphics/tiff/Make.defs
@ -0,0 +1,39 @@
+############################################################################
+# apps/graphics/tiff/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_TIFF),y)
+CONFIGURED_APPS += graphics/tiff
+endif
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@ -96,3 +96,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/graphics/traveler/Kconfig
+++ b/graphics/traveler/Kconfig
@ -2,8 +2,15 @@
 # For a description of the syntax of this configuration file,
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
+config GRAPHICS_TRAVELER
+	bool "Traveler game"
+	default n
+	select FSUTILS_INIFILE
+	---help---
+		Enable or disable the graphic Traveler game

 if GRAPHICS_TRAVELER
+
 comment "Color configuration"

 choice
--- a/graphics/traveler/Make.defs
+++ b/graphics/traveler/Make.defs
@ -0,0 +1,40 @@
+############################################################################
+# apps/graphics/traveler/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_GRAPHICS_TRAVELER),y)
+CONFIGURED_APPS += graphics/traveler
+endif
+
--- a/graphics/traveler/Makefile
+++ b/graphics/traveler/Makefile
@ -183,3 +183,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/interpreters/.gitignore
+++ b/interpreters/.gitignore
@ -1 +1,2 @@
-/pcode
+/Kconfig
+
--- a/interpreters/Kmenu
+++ b/interpreters/Kmenu
@ -0,0 +1 @@
+Interpreters
--- a/interpreters/Make.defs
+++ b/interpreters/Make.defs
@ -34,18 +34,4 @@
 #
 ############################################################################

-ifeq ($(CONFIG_INTERPRETERS_BAS),y)
-CONFIGURED_APPS += interpreters/bas
-endif
-
-ifeq ($(CONFIG_INTERPRETERS_FICL),y)
-CONFIGURED_APPS += interpreters/ficl
-endif
-
-ifeq ($(CONFIG_INTERPRETERS_MICROPYTHON),y)
-CONFIGURED_APPS += interpreters/micropython
-endif
-
-ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
-CONFIGURED_APPS += interpreters/pcode
-endif
+include $(wildcard interpreters/*/Make.defs)
--- a/interpreters/Makefile
+++ b/interpreters/Makefile
@ -33,46 +33,4 @@
 #
 ############################################################################

-include $(TOPDIR)/.config
-
-# Sub-directories containing interpreter runtime
-
-SUBDIRS = bas ficl micropython pcode prun
-
-# Create the list of installed runtime modules (INSTALLED_DIRS)
-
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-define ADD_DIRECTORY
-INSTALLED_DIRS  += ${shell if exist $1\Makefile (echo $1)}
-endef
-else
-define ADD_DIRECTORY
-INSTALLED_DIRS  += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi}
-endef
-endif
-
-$(foreach DIR, $(SUBDIRS), $(eval $(call ADD_DIRECTORY,$(DIR))))
-
-all: nothing
-.PHONY: nothing context depend clean distclean
-
-define SDIR_template
-$(1)_$(2):
-	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-endef
-
-$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
-$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
-
-nothing:
-
-install:
-
-context:
-
-depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend)
-
-clean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_clean)
-
-distclean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean)
+include $(APPDIR)/Directory.mk
--- a/interpreters/bas/Make.defs
+++ b/interpreters/bas/Make.defs
@ -0,0 +1,4 @@
+ifeq ($(CONFIG_INTERPRETERS_BAS),y)
+CONFIGURED_APPS += interpreters/bas
+endif
+
--- a/interpreters/bas/Makefile
+++ b/interpreters/bas/Makefile
@ -120,3 +120,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/interpreters/ficl/Make.defs
+++ b/interpreters/ficl/Make.defs
@ -0,0 +1,4 @@
+ifeq ($(CONFIG_INTERPRETERS_FICL),y)
+CONFIGURED_APPS += interpreters/ficl
+endif
+
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@ -118,3 +118,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/interpreters/micropython/Make.defs
+++ b/interpreters/micropython/Make.defs
@ -0,0 +1,4 @@
+ifeq ($(CONFIG_INTERPRETERS_MICROPYTHON),y)
+CONFIGURED_APPS += interpreters/micropython
+endif
+
--- a/interpreters/micropython/Makefile
+++ b/interpreters/micropython/Makefile
@ -182,3 +182,5 @@ distclean: clean

 -include $(MICROPYTHON_SRCDIR)/mkrules.mk
 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/interpreters/pcode/Kconfig
+++ b/interpreters/pcode/Kconfig
@ -1,13 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "Interpreters"
-
-source "$APPSDIR/interpreters/bas/Kconfig"
-source "$APPSDIR/interpreters/ficl/Kconfig"
-
 config INTERPRETERS_PCODE
 	bool "Pascal p-code interpreter"
 	default n
@ -21,5 +11,3 @@ config INTERPRETERS_PCODE
 if INTERPRETERS_PCODE
 endif

-source "$APPSDIR/interpreters/micropython/Kconfig"
-endmenu # Interpreters
--- a/interpreters/pcode/Make.defs
+++ b/interpreters/pcode/Make.defs
@ -0,0 +1,4 @@
+ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
+CONFIGURED_APPS += interpreters/pcode
+endif
+
--- a/modbus/Makefile
+++ b/modbus/Makefile
@ -119,3 +119,5 @@ distclean: clean

 -include Make.dep

+.PHONY: preconfig
+preconfig:
--- a/netutils/.gitignore
+++ b/netutils/.gitignore
@ -13,3 +13,5 @@
 *.adb
 *.lib
 *.src
+/Kconfig
+
--- a/netutils/Kconfig
+++ b/netutils/Kconfig
@ -1,28 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-menu "Network Utilities"
-
-source "$APPSDIR/netutils/chat/Kconfig"
-source "$APPSDIR/netutils/codecs/Kconfig"
-source "$APPSDIR/netutils/dhcpc/Kconfig"
-source "$APPSDIR/netutils/dhcpd/Kconfig"
-source "$APPSDIR/netutils/esp8266/Kconfig"
-source "$APPSDIR/netutils/ftpc/Kconfig"
-source "$APPSDIR/netutils/ftpd/Kconfig"
-source "$APPSDIR/netutils/json/Kconfig"
-source "$APPSDIR/netutils/smtp/Kconfig"
-source "$APPSDIR/netutils/telnetd/Kconfig"
-source "$APPSDIR/netutils/tftpc/Kconfig"
-source "$APPSDIR/netutils/thttpd/Kconfig"
-source "$APPSDIR/netutils/netlib/Kconfig"
-source "$APPSDIR/netutils/webclient/Kconfig"
-source "$APPSDIR/netutils/webserver/Kconfig"
-source "$APPSDIR/netutils/ntpclient/Kconfig"
-source "$APPSDIR/netutils/discover/Kconfig"
-source "$APPSDIR/netutils/xmlrpc/Kconfig"
-source "$APPSDIR/netutils/pppd/Kconfig"
-
-endmenu # Network Utilities
--- a/netutils/Kmenu
+++ b/netutils/Kmenu
@ -0,0 +1 @@
+Network Utilities
--- a/netutils/Make.defs
+++ b/netutils/Make.defs
@ -34,78 +34,4 @@
 #
 ############################################################################

-ifeq ($(CONFIG_NETUTILS_CHAT),y)
-CONFIGURED_APPS += netutils/chat
-endif
-
-ifeq ($(CONFIG_NETUTILS_CODECS),y)
-CONFIGURED_APPS += netutils/codecs
-endif
-
-ifeq ($(CONFIG_NETUTILS_DHCPC),y)
-CONFIGURED_APPS += netutils/dhcpc
-endif
-
-ifeq ($(CONFIG_NETUTILS_DHCPD),y)
-CONFIGURED_APPS += netutils/dhcpd
-endif
-
-ifeq ($(CONFIG_NETUTILS_ESP8266),y)
-CONFIGURED_APPS += netutils/esp8266
-endif
-
-ifeq ($(CONFIG_NETUTILS_FTPC),y)
-CONFIGURED_APPS += netutils/ftpc
-endif
-
-ifeq ($(CONFIG_NETUTILS_FTPD),y)
-CONFIGURED_APPS += netutils/ftpd
-endif
-
-ifeq ($(CONFIG_NETUTILS_JSON),y)
-CONFIGURED_APPS += netutils/json
-endif
-
-ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y)
-CONFIGURED_APPS += netutils/ntpclient
-endif
-
-ifeq ($(CONFIG_NETUTILS_PPPD),y)
-CONFIGURED_APPS += netutils/pppd
-endif
-
-ifeq ($(CONFIG_NETUTILS_SMTP),y)
-CONFIGURED_APPS += netutils/smtp
-endif
-
-ifeq ($(CONFIG_NETUTILS_TELNETD),y)
-CONFIGURED_APPS += netutils/telnetd
-endif
-
-ifeq ($(CONFIG_NETUTILS_TFTPC),y)
-CONFIGURED_APPS += netutils/tftpc
-endif
-
-ifeq ($(CONFIG_NETUTILS_THTTPD),y)
-CONFIGURED_APPS += netutils/thttpd
-endif
-
-ifeq ($(CONFIG_NETUTILS_NETLIB),y)
-CONFIGURED_APPS += netutils/netlib
-endif
-
-ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)
-CONFIGURED_APPS += netutils/webclient
-endif
-
-ifeq ($(CONFIG_NETUTILS_WEBSERVER),y)
-CONFIGURED_APPS += netutils/webserver
-endif
-
-ifeq ($(CONFIG_NETUTILS_DISCOVER),y)
-CONFIGURED_APPS += netutils/discover
-endif
-
-ifeq ($(CONFIG_NETUTILS_XMLRPC),y)
-CONFIGURED_APPS += netutils/xmlrpc
-endif
+include $(wildcard netutils/*/Make.defs)
--- a/netutils/Makefile
+++ b/netutils/Makefile
@ -33,37 +33,4 @@
 #
 ############################################################################

-include $(TOPDIR)/.config	# Current configuration
-
-# Sub-directories
-
-SUBDIRS  = chat json codecs esp8266
-ifeq ($(CONFIG_NET),y)
-SUBDIRS += netlib dhcpc dhcpd discover ftpc ftpd smtp telnetd
-SUBDIRS += webclient webserver tftpc thttpd xmlrpc pppd
-endif
-
-all: nothing
-
-.PHONY: nothing context depend clean distclean
-
-define SDIR_template
-$(1)_$(2):
-	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-endef
-
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
-
-nothing:
-
-install:
-
-context:
-
-depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
-
-clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
-
-distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
+include $(APPDIR)/Directory.mk
--- a/netutils/chat/Make.defs
+++ b/netutils/chat/Make.defs
@ -0,0 +1,40 @@
+############################################################################
+# apps/netutils/chat/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_CHAT),y)
+CONFIGURED_APPS += netutils/chat
+endif
+
--- a/netutils/chat/Makefile
+++ b/netutils/chat/Makefile
@ -96,3 +96,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/codecs/Make.defs
+++ b/netutils/codecs/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/codecs/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_CODECS),y)
+CONFIGURED_APPS += netutils/codecs
+endif
+
--- a/netutils/codecs/Makefile
+++ b/netutils/codecs/Makefile
@ -94,3 +94,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/dhcpc/Make.defs
+++ b/netutils/dhcpc/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/dhcpc/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_DHCPC),y)
+CONFIGURED_APPS += netutils/dhcpc
+endif
+
--- a/netutils/dhcpc/Makefile
+++ b/netutils/dhcpc/Makefile
@ -100,3 +100,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/dhcpd/Make.defs
+++ b/netutils/dhcpd/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/dhcpd/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_DHCPD),y)
+CONFIGURED_APPS += netutils/dhcpd
+endif
+
--- a/netutils/dhcpd/Makefile
+++ b/netutils/dhcpd/Makefile
@ -100,3 +100,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/discover/Make.defs
+++ b/netutils/discover/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/discover/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_DISCOVER),y)
+CONFIGURED_APPS += netutils/discover
+endif
+
--- a/netutils/discover/Makefile
+++ b/netutils/discover/Makefile
@ -103,3 +103,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/esp8266/Make.defs
+++ b/netutils/esp8266/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/esp8266/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_ESP8266),y)
+CONFIGURED_APPS += netutils/esp8266
+endif
+
--- a/netutils/esp8266/Makefile
+++ b/netutils/esp8266/Makefile
@ -96,3 +96,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/ftpc/Make.defs
+++ b/netutils/ftpc/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/ftpc/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_FTPC),y)
+CONFIGURED_APPS += netutils/ftpc
+endif
+
--- a/netutils/ftpc/Makefile
+++ b/netutils/ftpc/Makefile
@ -116,3 +116,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/ftpd/Make.defs
+++ b/netutils/ftpd/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/ftpd/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_FTPD),y)
+CONFIGURED_APPS += netutils/ftpd
+endif
+
--- a/netutils/ftpd/Makefile
+++ b/netutils/ftpd/Makefile
@ -100,3 +100,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/json/Make.defs
+++ b/netutils/json/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/json/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_JSON),y)
+CONFIGURED_APPS += netutils/json
+endif
+
--- a/netutils/json/Makefile
+++ b/netutils/json/Makefile
@ -94,3 +94,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/netlib/Make.defs
+++ b/netutils/netlib/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/netlib/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_NETLIB),y)
+CONFIGURED_APPS += netutils/netlib
+endif
+
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@ -142,3 +142,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/ntpclient/Make.defs
+++ b/netutils/ntpclient/Make.defs
@ -0,0 +1,39 @@
+# apps/netutils/ntpclient/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y)
+CONFIGURED_APPS += netutils/ntpclient
+endif
+
--- a/netutils/ntpclient/Makefile
+++ b/netutils/ntpclient/Makefile
@ -100,3 +100,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/netutils/ping/Kconfig
+++ b/netutils/ping/Kconfig
@ -1,30 +1,31 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-config NETUTILS_PING
-	bool "ICMP ping support"
-	default n
-	depends on NET_IPv4 && NET_ICMP && NET_PKT
-	help
-		Build in support for a IPv4 ping command.  This command ping will
-		send the ICMP ECHO_REQUEST and wait for the ICMP ECHO_RESPONSE from
-		the remote peer.
-
-config NETUTILS_PING6
-	bool "ICMPv6 ping support"
-	default n
-	depends on NET_IPv6 && NET_ICMPv6 && NET_PKT
-	help
-		Build in support for a IPv6 ping command.  This command ping will
-		send the ICMPv6 ECHO_REQUEST and wait for the ICMPv6 ECHO_RESPONSE
-		from the remote peer.
-
-if NETUTILS_PING || NETUTILS_PING6
-
-config NETUTILS_PING_SIGNO
-	int "Ping timeout signal"
-	default 13
-
-endif # NETUTILS_PING || NETUTILS_PING6
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config NETUTILS_PING
+	bool "ICMP ping support"
+	default n
+	depends on NET_IPv4 && NET_ICMP && NET_PKT
+	help
+		Build in support for a IPv4 ping command.  This command ping will
+		send the ICMP ECHO_REQUEST and wait for the ICMP ECHO_RESPONSE from
+		the remote peer.
+
+config NETUTILS_PING6
+	bool "ICMPv6 ping support"
+	default n
+	depends on NET_IPv6 && NET_ICMPv6 && NET_PKT
+	help
+		Build in support for a IPv6 ping command.  This command ping will
+		send the ICMPv6 ECHO_REQUEST and wait for the ICMPv6 ECHO_RESPONSE
+		from the remote peer.
+
+if NETUTILS_PING || NETUTILS_PING6
+
+config NETUTILS_PING_SIGNO
+	int "Ping timeout signal"
+	default 13
+
+endif # NETUTILS_PING || NETUTILS_PING6
+
--- a/netutils/ping/Makefile
+++ b/netutils/ping/Makefile
@ -104,3 +104,5 @@ distclean: clean
 	$(call DELFILE, .depend)

 -include Make.dep
+.PHONY: preconfig
+preconfig:
--- a/Show More
+++ b/Show More