Changeset 938 in kBuild for trunk/src

Timestamp:

May 26, 2007 8:03:34 PM (18 years ago)

Author:

bird

Message:

publish the two new make features.

Location:

trunk/src/gmakenew

Files:

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

trunk/src/gmakenew/main.c

@@ -1317 +1317 @@
                           o_default, f_append, 0);
 #endif
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  do_variable_definition (NILF, ".FEATURES", "explicit-multitarget",
+                          o_default, f_append, 0);
+#endif
+#ifdef CONFIG_WITH_PREPEND_ASSIGNMENT
+  do_variable_definition (NILF, ".FEATURES", "prepend-assignment",
+                          o_default, f_append, 0);
+#endif
 
   /* Read in variables from the environment.  It is important that this be
@@ -2761 +2769 @@
                     {
                       sl->max += 5;
-                      sl->list = xrealloc (sl->list,
+                      sl->list = xrealloc ((void *)sl->list, /* bird */
                                            sl->max * sizeof (char *));
                     }

trunk/src/gmakenew/variable.c

@@ -1027 +1027 @@
 
   /* Define KMK_FEATURES to indicate various working KMK features. */
-# if defined(CONFIG_WITH_TOUPPER_TOLOWER) \
-  && defined(CONFIG_WITH_RSORT) \
+# if defined(CONFIG_WITH_RSORT) \
   && defined(CONFIG_WITH_ABSPATHEX) \
+  && defined(CONFIG_WITH_TOUPPER_TOLOWER) \
   && defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE) \
   && defined(CONFIG_WITH_STACK) \
   && defined(CONFIG_WITH_MATH) \
   && defined(CONFIG_WITH_XARGS) \
+  && defined(CONFIG_WITH_EXPLICIT_MULTITARGET) \
+  && defined(CONFIG_WITH_PREPEND_ASSIGNMENT) \
   && defined(KMK_HELPERS)
   (void) define_variable ("KMK_FEATURES", 12,
@@ -1044 +1046 @@
                           " math-int"
                           " xargs"
+                          " explicit-multitarget"
+                          " prepend-assignment"
                           " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one "
                           , o_default, 0);
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
+#  error "All features should be enabled by default!"
   strcpy (buf, "append-dash-n abspath");
 #  if defined (CONFIG_WITH_RSORT)
@@ -1069 +1074 @@
   strcat (buf, " xargs");
 #  endif
-#  ifdef KMK_HELPERS
+#  if defined (CONFIG_WITH_EXPLICIT_MULTITARGET)
+  strcat (buf, " explicit-multitarget");
+#  endif
+#  if defined (CONFIG_WITH_PREPEND_ASSIGNMENT) \
+  strcat (buf, " prepend-assignment");
+#  endif
+#  if defined (KMK_HELPERS)
   strcat (buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one");
 #  endif