Changeset 765 for trunk/src/gmake

Timestamp:

Jan 19, 2007, 2:52:46 AM (19 years ago)

Author:

bird

Message:

New predefined variable 'KMK', similar to 'MAKE' only less likely to be defined in the environment.

Location:

trunk/src/gmake

Files:

• commands.c (modified) (2 diffs)
• main.c (modified) (3 diffs)

trunk/src/gmake/commands.c

@@ -355 +355 @@
       /* If no explicit '+' was given, look for MAKE variable references.  */
       if (!(flags & COMMANDS_RECURSE)
+#ifndef KMK
           && (strstr (p, "$(MAKE)") != 0 || strstr (p, "${MAKE}") != 0))
+#else
+          && (strstr (p, "$(KMK)") != 0 || strstr (p, "${KMK}") != 0 ||
+              strstr (p, "${MAKE}") != 0 || strstr (p, "${MAKE}") != 0))
+#endif
         flags |= COMMANDS_RECURSE;
 
@@ -390 +395 @@
 #ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
       file->command_flags |= COMMANDS_NO_COMMANDS;
-#endif 
+#endif
       set_command_state (file, cs_running);
       file->update_status = 0;

trunk/src/gmake/main.c

@@ -420 +420 @@
       "print-data-base" },
 #ifdef CONFIG_PRETTY_COMMAND_PRINTING
-    { CHAR_MAX+6, flag, (char *) &pretty_command_printing, 1, 1, 1, 0, 0, 
+    { CHAR_MAX+6, flag, (char *) &pretty_command_printing, 1, 1, 1, 0, 0,
        "pretty-command-printing" },
-#endif 
+#endif
 #ifdef KMK
     { CHAR_MAX+5, positive_int, (char *) &process_priority, 1, 1, 0,
@@ -1408 +1408 @@
   (void) define_variable ("MAKE_COMMAND", 12, argv[0], o_default, 0);
   (void) define_variable ("MAKE", 4, "$(MAKE_COMMAND)", o_default, 1);
+#ifdef KMK
+  (void) define_variable ("KMK", 3, argv[0], o_default, 1);
+#endif
 
   if (command_variables != 0)
@@ -3066 +3069 @@
 %s\n",
           precede, KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH,
-          precede, version_string, 
+          precede, version_string,
           precede, precede, precede, precede, precede, precede, precede, precede);
 #else