diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
| commit | 811c449748d5bd0505f8510e5582892f94ac0cda (patch) | |
| tree | 2640249cb2a9605c7cd59467b9861b205e9bcc8a /applets | |
| parent | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (diff) | |
| parent | 19311bfa7b8e8c6effa9c375de9b0eb4338bee12 (diff) | |
| download | busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.gz busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.bz2 busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.zip | |
Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge
Conflicts:
coreutils/ls.c
shell/ash.c
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/.gitignore | 1 | ||||
| -rw-r--r-- | applets/Kbuild.src | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/applets/.gitignore b/applets/.gitignore index cc932fcc0..459938d67 100644 --- a/applets/.gitignore +++ b/applets/.gitignore | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | /applet_tables | 1 | /applet_tables |
| 2 | /usage | 2 | /usage |
| 3 | /usage_pod | ||
diff --git a/applets/Kbuild.src b/applets/Kbuild.src index 9b9808f25..b61239948 100644 --- a/applets/Kbuild.src +++ b/applets/Kbuild.src | |||
| @@ -42,3 +42,6 @@ quiet_cmd_gen_applet_tables = GEN include/applet_tables.h | |||
| 42 | 42 | ||
| 43 | include/applet_tables.h: applets/applet_tables | 43 | include/applet_tables.h: applets/applet_tables |
| 44 | $(call cmd,gen_applet_tables) | 44 | $(call cmd,gen_applet_tables) |
| 45 | |||
| 46 | include/NUM_APPLETS.h: applets/applet_tables | ||
| 47 | $(call cmd,gen_applet_tables) | ||