delete -W (noWarnings) flag

SCCS-vsn: usr.bin/make/compat.c 5.5
SCCS-vsn: usr.bin/make/parse.c 5.10

diff --git a/usr/src/usr.bin/make/compat.c b/usr/src/usr.bin/make/compat.c
index 3d08f66..52e0e28 100644 (file)
--- a/usr/src/usr.bin/make/compat.c
+++ b/usr/src/usr.bin/make/compat.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)compat.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)compat.c   5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -149,9 +149,7 @@ CompatRunCommand (cmd, gn)
      */
      
     if (*cmdStart == '\0') {
      */
      
     if (*cmdStart == '\0') {

-       if (!noWarnings) {
-           Error("%s expands to empty string", cmd);
-       }
+       Error("%s expands to empty string", cmd);

        return(0);
     } else {
        cmd = cmdStart;
        return(0);
     } else {
        cmd = cmdStart;

diff --git a/usr/src/usr.bin/make/parse.c b/usr/src/usr.bin/make/parse.c
index 6be705f..9479ea9 100644 (file)
--- a/usr/src/usr.bin/make/parse.c
+++ b/usr/src/usr.bin/make/parse.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)parse.c    5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)parse.c    5.10 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -246,11 +246,9 @@ Parse_Error(type, va_alist)
        va_list ap;
        char *fmt;
 
        va_list ap;
        char *fmt;
 

-       if (type == PARSE_WARNING && noWarnings)
-               return;

        (void)fprintf(stderr, "\"%s\", line %d: ", fname, lineno);
        if (type == PARSE_WARNING)
        (void)fprintf(stderr, "\"%s\", line %d: ", fname, lineno);
        if (type == PARSE_WARNING)

-               (void)fprintf(stderr, "Warning: ");
+               (void)fprintf(stderr, "warning: ");

        va_start(ap);
        fmt = va_arg(ap, char *);
        (void)vfprintf(stderr, fmt, ap);
        va_start(ap);
        fmt = va_arg(ap, char *);
        (void)vfprintf(stderr, fmt, ap);