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

trunk/src/kmk/main.c

@@ -275 +275 @@
                                         break;
                                 case 'a':
+#ifdef USE_ARCHIVES
                                         debug |= DEBUG_ARCH;
+#endif /* else ignore */
                                         break;
                                 case 'c':
@@ -606 +608 @@
 
             if (uname(&utsname) == -1) {
-                    perror("make: uname");
+                    perror(MAKE_NAME ": uname");
                     exit(2);
             }
@@ -775 +777 @@
          * parsing the makefile(s)
          */
+#ifdef USE_ARCHIVES
         Arch_Init();
+#endif
         Targ_Init();
         Suff_Init();
@@ -855 +859 @@
                 sysMkPath = Lst_Init (FALSE);
                 Dir_Expand (_PATH_DEFSYSMK, sysIncPath, sysMkPath);
-                #ifdef NMAKE
+#ifdef NMAKE
                 if (!Lst_IsEmpty(sysMkPath))
                 {
                     ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
                     if (ln != NILLNODE)
-                            Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
+                            Fatal(MAKE_NAME ": cannot open %s.", (char *)Lst_Datum(ln));
                 }
-                /* Fatal("make: no system rules (%s).", _PATH_DEFSYSMK); */
-                #else
+
+#elif defined(KMK)
+                if (!Lst_IsEmpty(sysMkPath))
+                {
+                    ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
+                    if (ln != NILLNODE)
+                            Fatal(MAKE_NAME ": cannot open %s.", (char *)Lst_Datum(ln));
+
+                }
+                Error(MAKE_NAME ": no config rules (%s).", _PATH_DEFSYSMK);
+#else
                 if (Lst_IsEmpty(sysMkPath))
-                        Fatal("make: no system rules (%s).", _PATH_DEFSYSMK);
+                        Fatal(MAKE_NAME ": no system rules (%s).", _PATH_DEFSYSMK);
                 ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
                 if (ln != NILLNODE)
-                        Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
-                #endif
+                        Fatal(MAKE_NAME ": cannot open %s.", (char *)Lst_Datum(ln));
+#endif
         }
 
@@ -877 +890 @@
                 ln = Lst_Find(makefiles, (ClientData)NULL, ReadMakefile);
                 if (ln != NILLNODE)
-                        Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
+                        Fatal(MAKE_NAME ": cannot open %s.", (char *)Lst_Datum(ln));
         } else
             #ifdef KMK
@@ -1025 +1038 @@
         Suff_End();
         Targ_End();
+#ifdef USE_ARCHIVES
         Arch_End();
+#endif
         str_end();
         Var_End();
@@ -1357 +1372 @@
 #endif
 
-        (void)fprintf(stderr, "make: ");
+        (void)fprintf(stderr, MAKE_NAME ": ");
         (void)vfprintf(stderr, fmt, ap);
         va_end(ap);
@@ -1503 +1518 @@
         (void)fprintf(stderr, "%s\n%s\n%s\n"
 #ifdef NMAKE
+"%s\n"
+#endif
+#ifdef KMK
 "%s\n"
 #endif
@@ -1511 +1529 @@
 #ifdef NMAKE
 ,"NMAKE compatible mode enabled."
-
+#endif
+#ifdef KMK
+,"kMk extensions enabled."
 #endif
 );