Changeset 46 for trunk/src/kmk/suff.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/suff.c (modified) (15 diffs)

trunk/src/kmk/suff.c

@@ -117 +117 @@
     short        flags;         /* Type of suffix */
 #define SUFF_INCLUDE      0x01      /* One which is #include'd */
+#ifdef USE_ARCHIVES
 #define SUFF_LIBRARY      0x02      /* One which contains a library */
+#endif
 #define SUFF_NULL         0x04      /* The empty suffix */
     Lst          searchPath;    /* The path along which files of this suffix
@@ -177 +179 @@
 static Boolean SuffApplyTransform __P((GNode *, GNode *, Suff *, Suff *));
 static void SuffFindDeps __P((GNode *, Lst));
+#ifdef USE_ARCHIVES
 static void SuffFindArchiveDeps __P((GNode *, Lst));
+#endif
 static void SuffFindNormalDeps __P((GNode *, Lst));
 static int SuffPrintName __P((ClientData, ClientData));
@@ -892 +896 @@
             }
 #endif /* INCLUDES */
+#ifdef USE_ARCHIVES
 #ifdef LIBRARIES
             if (s->flags & SUFF_LIBRARY) {
@@ -897 +902 @@
             }
 #endif /* LIBRARIES */
+#endif
             Dir_Concat(s->searchPath, dirSearchPath);
         } else {
@@ -944 +950 @@
 }
 
+#ifdef USE_ARCHIVES
 /*-
  *-----------------------------------------------------------------------
@@ -973 +980 @@
     }
 }
+#endif /* USE_ARCHIVES */
 
           /********** Implicit Source Search Functions *********/
@@ -1347 +1355 @@
             Lst     members = Lst_Init(FALSE);
 
+#ifdef USE_ARCHIVES
             if (cgn->type & OP_ARCHV) {
                 /*
@@ -1356 +1365 @@
 
                 (void)Arch_ParseArchive(&sacrifice, members, pgn);
-            } else {
+            } else
+#endif
+            {
                 /*
                  * Break the result into a vector of strings whose nodes
@@ -1649 +1660 @@
 
 
+#ifdef USE_ARCHIVES
 /*-
  *-----------------------------------------------------------------------
@@ -1785 +1797 @@
     mem->type |= OP_MEMBER;
 }
+#endif /* USE_ARCHIVES */
 
 /*-
@@ -2056 +2069 @@
     }
 
+#ifdef USE_ARCHIVES
     /*
      * If the suffix indicates that the target is a library, mark that in
@@ -2063 +2077 @@
         gn->type |= OP_LIB;
     }
+#endif
 
     /*
@@ -2226 +2241 @@
     }
 
+#ifdef USE_ARCHIVES
     if (gn->type & OP_ARCHV) {
         SuffFindArchiveDeps(gn, slst);
@@ -2257 +2273 @@
          */
         Var_Set(PREFIX, "", gn);
-    } else {
+    } else
+#endif /* USE_ARCHIVES */
         SuffFindNormalDeps(gn, slst);
-    }
 }
 
@@ -2404 +2420 @@
                     printf ("INCLUDE");
                     break;
+#ifdef USE_ARCHIVES
                 case SUFF_LIBRARY:
                     printf ("LIBRARY");
                     break;
+#endif
             }
             fputc(flags ? '|' : ')', stdout);