Changeset 1408 for trunk/src/kmk/variable.c

Timestamp:

Mar 17, 2008, 11:21:36 PM (17 years ago)

Author:

bird

Message:

Implemented local variable definitions - CONFIG_WITH_LOCAL_VARIABLES.

File:

• trunk/src/kmk/variable.c (modified) (4 diffs)

trunk/src/kmk/variable.c

@@ -1536 +1536 @@
 #endif
 
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+          /* If we have += but we're in a target or local variable context,
+             we want to append only with other variables in the context of
+             this target.  */
+        if (target_var || origin == o_local)
+#else
         /* If we have += but we're in a target variable context, we want to
            append only with other variables in the context of this target.  */
         if (target_var)
+#endif
           {
             append = 1;
@@ -1734 +1741 @@
 #endif
                               origin, flavor == f_recursive,
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+                              (target_var || origin == o_local
+#else
                               (target_var
+#endif
                                ? current_variable_set_list->set : NULL),
                               flocp);
@@ -1868 +1879 @@
 /* Try to interpret LINE (a null-terminated string) as a variable definition.
 
-   ORIGIN may be o_file, o_override, o_env, o_env_override,
+   ORIGIN may be o_file, o_override, o_env, o_env_override, o_local,
    or o_command specifying that the variable definition comes
    from a makefile, an override directive, the environment with
@@ -1935 +1946 @@
       origin = _("automatic");
       break;
+#ifdef CONFIG_WITH_LOCAL_VARIABLES
+    case o_local:
+      origin = _("`local' directive");
+      break;
+#endif
     case o_invalid:
     default: