diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-16 17:05:00 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-16 17:05:00 +0000 |
commit | 880aa24ce3cb2bae6decbbdb2650f91a2547ba53 (patch) | |
tree | 6e7738015216d3c39847602e0ea776a3e14faa19 /apps/nshlib | |
parent | d904fafdf2f9f7ad686bd9d8b616aa310f5346eb (diff) | |
download | nuttx-880aa24ce3cb2bae6decbbdb2650f91a2547ba53.tar.gz nuttx-880aa24ce3cb2bae6decbbdb2650f91a2547ba53.tar.bz2 nuttx-880aa24ce3cb2bae6decbbdb2650f91a2547ba53.zip |
Rename apps/include/apps.h to builtin.h. Move parts of apps/builtins/exec_builtin.c to binfmt/libbuiltin/libbuiltin_utils.c
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5524 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib')
-rw-r--r-- | apps/nshlib/Kconfig | 2 | ||||
-rw-r--r-- | apps/nshlib/nsh_builtin.c | 3 | ||||
-rw-r--r-- | apps/nshlib/nsh_parse.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index e60e9c480..9cfc020a5 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -15,7 +15,7 @@ if NSH_LIBRARY config NSH_BUILTIN_APPS bool "Enable built-in applications" default y - depends on BUILTIN + select BUILTIN ---help--- Support external registered, "built-in" applications that can be executed from the NSH command line (see apps/README.txt for diff --git a/apps/nshlib/nsh_builtin.c b/apps/nshlib/nsh_builtin.c index 16e3e9427..ba39e8dfe 100644 --- a/apps/nshlib/nsh_builtin.c +++ b/apps/nshlib/nsh_builtin.c @@ -54,7 +54,8 @@ #include <errno.h> #include <string.h> -#include <apps/apps.h> +#include <nuttx/binfmt/builtin.h> +#include <apps/builtin.h> #include "nsh.h" #include "nsh_console.h" diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index 15723b497..c36724372 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -59,7 +59,7 @@ #endif #ifdef CONFIG_NSH_BUILTIN_APPS -# include <apps/apps.h> +# include <nuttx/binfmt/builtin.h> #endif #include <apps/nsh.h> |