Changeset 520 for trunk/src/gmake/read.c

Timestamp:

Sep 16, 2006, 6:56:25 AM (19 years ago)

Author:

bird

Message:

Cleaning up the modifications. Changes are now either configurable or marked, and dead stuff has been removed (dll shell).

File:

• trunk/src/gmake/read.c (modified) (4 diffs)

trunk/src/gmake/read.c

@@ -223 +223 @@
 #ifdef VMS
         /* all lower case since readdir() (the vms version) 'lowercasifies' */
+# ifdef KMK
         { "makefile.kmk", "makefile.vms", "gnumakefile.", "makefile.", 0 };
+# else
+        { "makefile.vms", "gnumakefile.", "makefile.", 0 };
+# endif 
 #else
 #ifdef _AMIGA
         /* what's the deal here? no dots? */
+# ifdef KMK
         { "Makefile.kmk", "makefile.kmk", "GNUmakefile", "Makefile", "SMakefile", 0 };
+# else
+        { "GNUmakefile", "Makefile", "SMakefile", 0 };
+# endif
 #else /* !Amiga && !VMS */
+# ifdef KMK
         { "Makefile.kmk", "makefile.kmk", "GNUmakefile", "makefile", "Makefile", 0 };
+# else
+        { "GNUmakefile", "makefile", "Makefile", 0 };
+# endif
 #endif /* AMIGA */
 #endif /* VMS */
@@ -1157 +1169 @@
               fatal (fstart, _("missing target pattern"));
             else if (target->next != 0)
-              fatal (fstart, _("multiple target patterns (target `%s')"), target->name);
+              fatal (fstart, _("multiple target patterns (target `%s')"), target->name); /* bird */
             pattern = target->name;
             pattern_percent = find_percent (pattern);
             if (pattern_percent == 0)
-              fatal (fstart, _("target pattern contains no `%%' (target `%s')"), target->name);
+              fatal (fstart, _("target pattern contains no `%%' (target `%s')"), target->name); /* bird */
             free ((char *)target);
           }
@@ -2156 +2168 @@
   unsigned int string_len = 0;
   register char *p = string;
-  register int ch; /* bird */
+  register int ch; /* bird: 'optimiziations' */
 
   if (ignorevars)
@@ -2269 +2281 @@
   struct nameseq *new = 0;
   struct nameseq *new1;
-#ifndef NO_ARCHIVES
+#ifndef NO_ARCHIVES /* bird: MSC warning */
   struct nameseq *lastnew1;
 #endif