Changeset 46 for trunk/src/kmk/make.c

Timestamp:

Apr 4, 2003, 2:03:50 AM (22 years ago)

Author:

bird

Message:

kMk changes. Made extensions configurable from config.h. fixed parents.

File:

• trunk/src/kmk/make.c (modified) (6 diffs)

trunk/src/kmk/make.c

@@ -194 +194 @@
         }
         oodate = FALSE;
+#ifdef USE_ARCHIVES
     } else if (gn->type & OP_LIB) {
         if (DEBUG(MAKE)) {
@@ -205 +206 @@
         oodate = Arch_LibOODate (gn) ||
             ((gn->cmtime == 0) && (gn->type & OP_DOUBLEDEP));
+#endif
     } else if (gn->type & OP_JOIN) {
         /*
@@ -624 +626 @@
 
 
-#ifdef KMK
+#ifdef USE_PARENTS
 /*-
  *-----------------------------------------------------------------------
@@ -637 +639 @@
  */
 static int
-MakeAddParents (cgnp, pgnp)
+MakeAddParents (pgnp, cgnp)
     ClientData  pgnp;   /* The parent to add to add */
     ClientData  cgnp;   /* The child to whose PARENTS variable it should be */
@@ -647 +649 @@
         char *p1 = NULL;
 
-        if (OP_NOP(pgn->type)) {
-            /*
-             * this node is only source; use the specific pathname for it
-             */
+
+        if (OP_NOP(pgn->type) || !(parent = Var_Value(TARGET, pgn, &p1))) {
+            /* this node is only source; use the specific pathname for it */
             parent = pgn->path ? pgn->path : pgn->name;
-        }
-        else
-            parent = Var_Value(TARGET, pgn, &p1);
+        }
         Var_Append(PARENTS, parent, cgn);
         efree(p1);
@@ -690 +689 @@
 {
     Lst_ForEach (gn->children, MakeAddAllSrc, (ClientData) gn);
-    #ifdef KMK
+#ifdef USE_PARENTS
     Lst_ForEach (gn->parents, MakeAddParents, (ClientData) gn);
-    #endif
+#endif
 
     if (!Var_Exists (OODATE, gn)) {