Changeset 338 for trunk/src/kDepPre/kDepPre.c

Timestamp:

Nov 7, 2005, 8:16:08 PM (20 years ago)

Author:

bird

Message:

Added new option -s for generating stub dependencies just like -Wp,-MP.

File:

• trunk/src/kDepPre/kDepPre.c (modified) (10 diffs)

trunk/src/kDepPre/kDepPre.c

@@ -37 +37 @@
 #if !defined(__WIN32__) && !defined(__OS2__)
 # include <dirent.h>
-#endif 
+#endif
 
 #ifdef HAVE_FGETC_UNLOCKED
@@ -74 +74 @@
 /** List of dependencies. */
 static PDEP g_pDeps = NULL;
-/** Whether or not to fixup win32 casing. */
-static int  g_fFixCase = 0;
+
+
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static PDEP depAdd(const char *pszFilename, size_t cchFilename);
+static void depOptimize(int fFixCase);
+static void depPrint(FILE *pOutput);
+static void depPrintStubs(FILE *pOutput);
 
 
@@ -198 +205 @@
 /**
  * Corrects all slashes to unix slashes.
- * 
+ *
  * @returns pszFilename.
  * @param   pszFilename     The filename to correct.
@@ -309 +316 @@
 
 
-
 /**
- * Prints the dependency chain.
- *
- * @returns Pointer to the allocated dependency.
- * @param   pOutput     Output stream.
+ * 'Optimizes' and corrects the dependencies.
  */
-static void depPrint(FILE *pOutput)
-{
+static void depOptimize(int fFixCase)
+{
+    /*
+     * Walk the list correct the names and re-insert them.
+     */
+    PDEP pDepOrg = g_pDeps;
     PDEP pDep = g_pDeps;
-    for (pDep = g_pDeps; pDep; pDep = pDep->pNext)
-    {
+    g_pDeps = NULL;
+    for (; pDep; pDep = pDep->pNext)
+    {
+#ifdef __WIN32__
+        char        szFilename[_MAX_PATH + 1];
+#else
+        char        szFilename[PATH_MAX + 1];
+#endif
+        char       *pszFilename;
         struct stat s;
-#ifdef __WIN32__
-        char    szFilename[_MAX_PATH + 1];
-#else
-        char    szFilename[PATH_MAX + 1];
-#endif 
-        char   *pszFilename;
-        char   *psz;
 
         /*
@@ -344 +351 @@
         if (pszFilename[1] == ':')
             pszFilename += 2;
-#endif 
+#endif
 
         /*
          * The microsoft compilers are notoriously screwing up the casing.
-         * This will screw with kmk (/ GNU Make) on case sensitive systems, it 
-         * may even do so on win32...
+         * This will screw up kmk (/ GNU Make).
          */
-        if (g_fFixCase)
+        if (fFixCase)
         {
 #ifdef __WIN32__
@@ -372 +378 @@
         }
 
-        fprintf(pOutput, " \\\n\t%s", pszFilename);
-    } /* foreach dependency */
+        /*
+         * Insert the corrected dependency.
+         */
+        depAdd(pszFilename, strlen(pszFilename));
+    }
+
+#if 0 /* waste of time */
+    /*
+     * Free the old ones.
+     */
+    while (pDepOrg)
+    {
+        pDep = pDepOrg;
+        pDepOrg = pDepOrg->pNext;
+        free(pDep);
+    }
+#endif
+}
+
+
+/**
+ * Prints the dependency chain.
+ *
+ * @returns Pointer to the allocated dependency.
+ * @param   pOutput     Output stream.
+ */
+static void depPrint(FILE *pOutput)
+{
+    PDEP pDep;
+    for (pDep = g_pDeps; pDep; pDep = pDep->pNext)
+        fprintf(pOutput, " \\\n\t%s", pDep->szFilename);
     fprintf(pOutput, "\n\n");
+}
+
+
+/**
+ * Prints empty dependency stubs for all dependencies.
+ */
+static void depPrintStubs(FILE *pOutput)
+{
+    PDEP pDep;
+    for (pDep = g_pDeps; pDep; pDep = pDep->pNext)
+        fprintf(pOutput, "%s:\n\n", pDep->szFilename);
 }
 
@@ -614 +660 @@
 static void usage(const char *argv0)
 {
-    printf("syntax: %s [-l=c] -o <output> -t <target> [-f] < - | <filename> | -e <cmdline> >\n", argv0);
+    printf("syntax: %s [-l=c] -o <output> -t <target> [-f] [-s] < - | <filename> | -e <cmdline> >\n", argv0);
 }
 
@@ -627 +673 @@
     FILE       *pInput = NULL;
     const char *pszTarget = NULL;
+    int         fStubs = 0;
+    int         fFixCase = 0;
     /* Argument parsing. */
     int         fInput = 0;             /* set when we've found input argument. */
@@ -747 +795 @@
                 case 'f':
                 {
-                    g_fFixCase = 1;
+                    fFixCase = 1;
+                    break;
+                }
+
+                /*
+                 * Generate stubs.
+                 */
+                case 's':
+                {
+                    fStubs = 1;
                     break;
                 }
@@ -831 +888 @@
     if (!i)
     {
+        depOptimize(fFixCase);
         fprintf(pOutput, "%s:", pszTarget);
         depPrint(pOutput);
+        if (fStubs)
+            depPrintStubs(pOutput);
     }