Changeset 1693 in kBuild

Timestamp:

Aug 31, 2008 7:35:37 PM (17 years ago)

Author:

bird

Message:

includedep: expand variabels when present. Fixes #38.

File:

• trunk/src/kmk/read.c (modified) (1 diff)

trunk/src/kmk/read.c

@@ -1329 +1329 @@
       if (word1eq ("includedep"))
         {
-            /* We have found an `includedep' line specifying a single nested
-               makefile to be read at this point. This include variation
-               does not globbing and doesn't support multiple names. It's
-               trying to save time by being dead simple. */
-            char *name = p2;
-            char *end = strchr(name, '\0');
-            char saved;
-
-            while (end > name && isspace ((unsigned char)end[-1]))
-              --end;
-
-            saved = *end; /* not sure if this is required... */
-            *end = '\0';
-            eval_include_dep (name, fstart);
-            *end = saved;
-
-            goto rule_complete;
-          }
+          /* We have found an `includedep' line specifying a single makefile
+             to be read at this point. This include variation does no
+             globbing and do not support multiple names. It's trying to save
+             time by being dead simple as well as ignoring errors. */
+          char *free_me = NULL;
+          char *name = p2;
+          char *end = strchr (name, '\0');
+          char saved;
+          if (memchr (name, '$', end - name))
+            {
+              free_me = name = allocated_variable_expand (name);
+              while (isspace ((unsigned char)*name))
+                ++name;
+              end = strchr (name, '\0');
+            }
+
+          while (end > name && isspace ((unsigned char)end[-1]))
+            --end;
+
+          saved = *end; /* not sure if this is required... */
+          *end = '\0';
+          eval_include_dep (name, fstart);
+          *end = saved;
+
+          if (free_me)
+            free (free_me);
+          goto rule_complete;
+        }
 #endif /* CONFIG_WITH_INCLUDEDEP */