summaryrefslogtreecommitdiffstats
path: root/apps/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-14 14:14:54 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-14 14:14:54 +0000
commitee2220174467b0e456446f5faaef1bd1660f786e (patch)
tree61937f54d7558e15f984b0450c2958e9ed45b5bd /apps/Makefile
parent38121cceb67b2408c5aab1d3e9998accef0d83c8 (diff)
VSN/apps update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3378 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/Makefile')
-rw-r--r--apps/Makefile17
1 files changed, 12 insertions, 5 deletions
diff --git a/apps/Makefile b/apps/Makefile
index ac07176fb9..40cae5a40a 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -42,21 +42,28 @@ endif
# Application Directories
-BUILTIN_APPS_DIR =
+# 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 =
ifeq ($(CONFIG_BUILTIN_APPS_NUTTX),y)
# Individual application: HELLO
ifeq ($(CONFIG_BUILTIN_APPS_HELLO),y)
-
BUILTIN_APPS_DIR += hello
-
-# we use a non-existing .built_always to guarantee that Makefile
-# always walks into the sub-directories and asks for build
BUILTIN_APPS_BUILT += hello/.built_always
+endif
+
+ifeq ($(CONFIG_BUILTIN_APPS_POWEROFF),y)
+BUILTIN_APPS_DIR += poweroff
+BUILTIN_APPS_BUILT += poweroff/.built_always
+endif
+ifeq ($(CONFIG_BUILTIN_APPS_JVM),y)
+BUILTIN_APPS_DIR += jvm
+BUILTIN_APPS_BUILT += jvm/.built_always
endif
# end of application list