4 files changed, 26 insertions, 6 deletions
diff --git a/applets/Kbuild.src b/applets/Kbuild.src
index e3bac9681..31fee8d1e 100644
--- a/applets/Kbuild.src
+++ b/applets/Kbuild.src
@@ -38,7 +38,7 @@ include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compress
        $(call cmd,gen_usage_compressed)
 quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h
-      cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h
+      cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h
 include/applet_tables.h: applets/applet_tables
        $(call cmd,gen_applet_tables)
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index e48be4682..338dc20f9 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
        }
        printf("\n");
-        printf("#ifndef SKIP_definitions\n");
+        //printf("#ifndef SKIP_definitions\n");
        printf("const char applet_names[] ALIGN1 = \"\"\n");
        for (i = 0; i < NUM_APPLETS; i++) {
                printf("\"%s\" \"\\0\"\n", applets[i].name);
@@ -123,9 +123,29 @@ int main(int argc, char **argv)
        }
        printf("};\n");
 #endif
-        printf("#endif /* SKIP_definitions */\n");
+        //printf("#endif /* SKIP_definitions */\n");
        printf("\n");
        printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);
+        if (argv[2]) {
+                char line_old[80];
+                char line_new[80];
+                FILE *fp;
+                line_old[0] = 0;
+                fp = fopen(argv[2], "r");
+                if (fp) {
+                        fgets(line_old, sizeof(line_old), fp);
+                        fclose(fp);
+                }
+                sprintf(line_new, "#define NUM_APPLETS %u\n", NUM_APPLETS);
+                if (strcmp(line_old, line_new) != 0) {
+                        fp = fopen(argv[2], "w");
+                        if (!fp)
+                                return 1;
+                        fputs(line_new, fp);
+                }
+        }
        return 0;
 }
diff --git a/applets/applets.c b/applets/applets.c
index 133a21575..6a3996272 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -6,8 +6,6 @@
 *
 * Licensed under GPLv2, see file License in this tarball for details.
 */
-#include <assert.h>
 #include "busybox.h"
 #if ENABLE_BUILD_LIBBUSYBOX
diff --git a/applets/usage_compressed b/applets/usage_compressed
index bfd5aa873..e1fd0d94d 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -9,7 +9,7 @@ test -x "$loc/usage" || exit 1
 test "$SED" || SED=sed
 test "$DD" || DD=dd
-exec >"$target"
+exec >"$target.$$"
 echo '#define UNPACKED_USAGE "" \'
 "$loc/usage" | od -v -t x1 \
@@ -39,3 +39,5 @@ echo '#define PACKED_USAGE \'
        -e 's/\(..\)/0x\1,/g' \
        -e 's/$/ \\/'
 echo ''
+mv -- "$target.$$" "$target"