2 files changed, 28 insertions, 15 deletions

diff --git a/applets/Kbuild.src b/applets/Kbuild.src
index b61239948..3aedbbffe 100644
--- a/applets/Kbuild.src
+++ b/applets/Kbuild.src
@@ -29,7 +29,7 @@ applets/applets.o: include/usage_compressed.h include/applet_tables.h
 
 applets/applet_tables: .config include/applets.h
 applets/usage:         .config include/applets.h
-applets/usage_pod:     .config include/applet_tables.h include/applets.h
+applets/usage_pod:     .config include/applets.h include/applet_tables.h
 
 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
       cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
@@ -37,11 +37,21 @@ quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
 include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compressed
         $(call cmd,gen_usage_compressed)
 
-quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h
+quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h include/NUM_APPLETS.h
       cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h
 
-include/applet_tables.h: applets/applet_tables
+include/NUM_APPLETS.h: applets/applet_tables
         $(call cmd,gen_applet_tables)
 
-include/NUM_APPLETS.h: applets/applet_tables
+# In fact, include/applet_tables.h depends only on applets/applet_tables,
+# and is generated by it. But specifying only it can run
+# applets/applet_tables twice, possibly in parallel.
+# We say that it also needs NUM_APPLETS.h
+#
+# Unfortunately, we need to list the same command,
+# and it can be executed twice (sequentially).
+# The alternative is to not list any command,
+# and then if include/applet_tables.h is deleted, it won't be rebuilt.
+#
+include/applet_tables.h: include/NUM_APPLETS.h applets/applet_tables
         $(call cmd,gen_applet_tables)
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index 7894b2c33..9a2aa5329 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -143,7 +143,9 @@ int main(int argc, char **argv)
         printf("};\n");
         printf("#endif\n\n");
 
-#if ENABLE_FEATURE_PREFER_APPLETS
+#if ENABLE_FEATURE_PREFER_APPLETS \
+ || ENABLE_FEATURE_SH_STANDALONE \
+ || ENABLE_FEATURE_SH_NOFORK
         printf("const uint8_t applet_flags[] ALIGN1 = {\n");
         i = 0;
         while (i < NUM_APPLETS) {
@@ -190,27 +192,28 @@ int main(int argc, char **argv)
         printf("};\n");
 #endif
         //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;
+                char line_new[80];
+//              char line_old[80];
 
-                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) {
+//              line_old[0] = 0;
+//              fp = fopen(argv[2], "r");
+//              if (fp) {
+//                      fgets(line_old, sizeof(line_old), fp);
+//                      fclose(fp);
+//              }
+//              if (strcmp(line_old, line_new) != 0) {
                         fp = fopen(argv[2], "w");
                         if (!fp)
                                 return 1;
                         fputs(line_new, fp);
-                }
+//              }
         }
 
         return 0;