Move VSN apps to apps/vsn

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3397 42af7a65-404d-4744-a932-0658087f49c3

18 files changed, 82 insertions, 12 deletions

diff --git a/apps/Make.defs b/apps/Make.defs
index 0a6e869dd..5b6cd9aa0 100755
--- a/apps/Make.defs
+++ b/apps/Make.defs
@@ -36,6 +36,6 @@
 
 define REGISTER
 	@echo "Register: $1"
-	@echo "{ .name = \"$1\", .priority = $2, .stacksize = $3, .main = $4 }," >> ../exec_nuttapp_list.h
-	@echo "EXTERN int $4(int argc, char *argv[]);" >> ../exec_nuttapp_proto.h
+	@echo "{ .name = \"$1\", .priority = $2, .stacksize = $3, .main = $4 }," >> "$(APPDIR)/exec_nuttapp_list.h"
+	@echo "EXTERN int $4(int argc, char *argv[]);" >> "$(APPDIR)/exec_nuttapp_proto.h"
 endef
diff --git a/apps/Makefile b/apps/Makefile
index b9a067c26..ce00bb667 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -42,8 +42,14 @@ endif
 
 # Application Directories
 
+# SUBDIRS is the list of all directories containing Makefiles.  It is used
+# only for cleaning.
+
+SUBDIRS = nshlib vsn
+
 # we use a non-existing .built_always to guarantee that Makefile
 # always walks into the sub-directories and asks for build
+
 BUILTIN_APPS_BUILT =
 BUILTIN_APPS_DIR =
 
@@ -130,15 +136,21 @@ $(BIN):	$(OBJS) $(BUILTIN_APPS_BUILT)
 
 depend: .depend
 
+define MAKECLEAN
+	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)"
+endef
+
 clean:
 	@rm -f $(BIN) *~ .*.swp *.o libapps.a
 	$(call CLEAN)
+	$(foreach DIR, $(SUBDIRS), $(eval $(call MAKECLEAN,$(DIR),clean)))
 
 distclean: clean
 	@rm -f .config
 	@rm -f Make.dep .depend
 	@rm -f exec_nuttapp_list.h
 	@rm -f exec_nuttapp_proto.h
+	$(foreach DIR, $(SUBDIRS), $(eval $(call MAKECLEAN,$(DIR),distclean)))
 
 -include Make.dep
 
diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile
new file mode 100644
index 000000000..d971d3fe4
--- /dev/null
+++ b/apps/vsn/Makefile
@@ -0,0 +1,58 @@
+############################################################################
+# vsn/Makefile
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# 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.
+#
+############################################################################
+
+# Sub-directories
+
+SUBDIRS = free hello poweroff ramtron sdcard
+
+all: nothing
+.PHONY: nothing
+
+nothing:
+
+define DOMAKE
+	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)"
+endef
+
+depend:
+	$(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),depend)))
+
+clean:
+	$(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),clean)))
+
+distclean: clean
+	$(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),distclean)))
+
+-include Make.dep
diff --git a/apps/free/Makefile b/apps/vsn/free/Makefile
index 33b2c564c..d63f7af3e 100644
--- a/apps/free/Makefile
+++ b/apps/vsn/free/Makefile
@@ -38,7 +38,7 @@
 # sourcing the Make.defs!
 
 -include $(TOPDIR)/Make.defs
-include ../Make.defs
+include ../../Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
@@ -60,7 +60,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= ../libapps$(LIBEXT)
+BIN	    	= ../../libapps$(LIBEXT)
 
 ROOTDEPPATH	= --dep-path .
 
diff --git a/apps/free/README.txt b/apps/vsn/free/README.txt
index dd92a94ae..dd92a94ae 100644
--- a/apps/free/README.txt
+++ b/apps/vsn/free/README.txt
diff --git a/apps/free/free.c b/apps/vsn/free/free.c
index fa5288cdd..fa5288cdd 100644
--- a/apps/free/free.c
+++ b/apps/vsn/free/free.c
diff --git a/apps/hello/Makefile b/apps/vsn/hello/Makefile
index 720d365af..a0bed80e1 100644
--- a/apps/hello/Makefile
+++ b/apps/vsn/hello/Makefile
@@ -38,7 +38,7 @@
 # sourcing the Make.defs!
 
 -include $(TOPDIR)/Make.defs
-include ../Make.defs
+include ../../Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
@@ -60,7 +60,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= ../libapps$(LIBEXT)
+BIN	    	= ../../libapps$(LIBEXT)
 
 ROOTDEPPATH	= --dep-path .
 
diff --git a/apps/hello/README.txt b/apps/vsn/hello/README.txt
index 531c4d193..531c4d193 100644
--- a/apps/hello/README.txt
+++ b/apps/vsn/hello/README.txt
diff --git a/apps/hello/hello.c b/apps/vsn/hello/hello.c
index fb94d0ea9..fb94d0ea9 100644
--- a/apps/hello/hello.c
+++ b/apps/vsn/hello/hello.c
diff --git a/apps/poweroff/Makefile b/apps/vsn/poweroff/Makefile
index b8e5ecd93..8e3538a2b 100644
--- a/apps/poweroff/Makefile
+++ b/apps/vsn/poweroff/Makefile
@@ -38,7 +38,7 @@
 # sourcing the Make.defs!
 
 -include $(TOPDIR)/Make.defs
-include ../Make.defs
+include ../../Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
@@ -60,7 +60,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= ../libapps$(LIBEXT)
+BIN	    	= ../../libapps$(LIBEXT)
 
 ROOTDEPPATH	= --dep-path .
 
diff --git a/apps/poweroff/README.txt b/apps/vsn/poweroff/README.txt
index e02180e5a..e02180e5a 100644
--- a/apps/poweroff/README.txt
+++ b/apps/vsn/poweroff/README.txt
diff --git a/apps/poweroff/poweroff.c b/apps/vsn/poweroff/poweroff.c
index f8b56e0d8..f8b56e0d8 100644
--- a/apps/poweroff/poweroff.c
+++ b/apps/vsn/poweroff/poweroff.c
diff --git a/apps/ramtron/Makefile b/apps/vsn/ramtron/Makefile
index d2430f747..42b73a09b 100644
--- a/apps/ramtron/Makefile
+++ b/apps/vsn/ramtron/Makefile
@@ -38,7 +38,7 @@
 # sourcing the Make.defs!
 
 -include $(TOPDIR)/Make.defs
-include ../Make.defs
+include ../../Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
@@ -60,7 +60,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= ../libapps$(LIBEXT)
+BIN	    	= ../../libapps$(LIBEXT)
 
 ROOTDEPPATH	= --dep-path .
 
diff --git a/apps/ramtron/README.txt b/apps/vsn/ramtron/README.txt
index 152774b66..152774b66 100644
--- a/apps/ramtron/README.txt
+++ b/apps/vsn/ramtron/README.txt
diff --git a/apps/ramtron/ramtron.c b/apps/vsn/ramtron/ramtron.c
index 323a42247..323a42247 100644
--- a/apps/ramtron/ramtron.c
+++ b/apps/vsn/ramtron/ramtron.c
diff --git a/apps/sdcard/Makefile b/apps/vsn/sdcard/Makefile
index 9df8cbe98..ccbd22952 100644
--- a/apps/sdcard/Makefile
+++ b/apps/vsn/sdcard/Makefile
@@ -38,7 +38,7 @@
 # sourcing the Make.defs!
 
 -include $(TOPDIR)/Make.defs
-include ../Make.defs
+include ../../Make.defs
 
 ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
@@ -60,7 +60,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN	    	= ../libapps$(LIBEXT)
+BIN	    	= ../../libapps$(LIBEXT)
 
 ROOTDEPPATH	= --dep-path .
 
diff --git a/apps/sdcard/README.txt b/apps/vsn/sdcard/README.txt
index 332aa26cf..332aa26cf 100644
--- a/apps/sdcard/README.txt
+++ b/apps/vsn/sdcard/README.txt
diff --git a/apps/sdcard/sdcard.c b/apps/vsn/sdcard/sdcard.c
index bf3e82a07..bf3e82a07 100644
--- a/apps/sdcard/sdcard.c
+++ b/apps/vsn/sdcard/sdcard.c