rename DONTCARE as OPTIONAL

SCCS-vsn: usr.bin/make/job.c 5.11
SCCS-vsn: usr.bin/make/make.h 5.9
SCCS-vsn: usr.bin/make/parse.c 5.11
SCCS-vsn: usr.bin/make/targ.c 5.6

diff --git a/usr/src/usr.bin/make/job.c b/usr/src/usr.bin/make/job.c
index f9d753a..184e42d 100644 (file)
--- a/usr/src/usr.bin/make/job.c
+++ b/usr/src/usr.bin/make/job.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -801,9 +801,9 @@ Job_Touch (gn, silent)
     struct timeval times[2];   /* Times for utimes() call */
     struct stat attr;        /* Attributes of the file */
 
     struct timeval times[2];   /* Times for utimes() call */
     struct stat attr;        /* Attributes of the file */
 

-    if (gn->type & (OP_JOIN|OP_USE|OP_EXEC|OP_DONTCARE)) {
+    if (gn->type & (OP_JOIN|OP_USE|OP_EXEC|OP_OPTIONAL)) {

        /*
        /*

-        * .JOIN, .USE, .ZEROTIME and .DONTCARE targets are "virtual" targets
+        * .JOIN, .USE, .ZEROTIME and .OPTIONAL targets are "virtual" targets

         * and, as such, shouldn't really be created.
         */
        return;
         * and, as such, shouldn't really be created.
         */
        return;


@@ -896,7 +896,7 @@ Job_CheckCommands (gn, abortProc)
             * given, we stop in our tracks, otherwise we just don't update
             * this node's parents so they never get examined. 
             */
             * given, we stop in our tracks, otherwise we just don't update
             * this node's parents so they never get examined. 
             */

-           if (gn->type & OP_DONTCARE) {
+           if (gn->type & OP_OPTIONAL) {

                printf ("Can't figure out how to make %s (ignored)\n",
                        gn->name);
            } else if (keepgoing) {
                printf ("Can't figure out how to make %s (ignored)\n",
                        gn->name);
            } else if (keepgoing) {

diff --git a/usr/src/usr.bin/make/make.h b/usr/src/usr.bin/make/make.h
index 4bb57a4..48e69ce 100644 (file)
--- a/usr/src/usr.bin/make/make.h
+++ b/usr/src/usr.bin/make/make.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)make.h      5.8 (Berkeley) %G%
+ *     @(#)make.h      5.9 (Berkeley) %G%

  */
 
 /*-
  */
 
 /*-


@@ -139,7 +139,7 @@ typedef struct GNode {
                                     * per line (::) */
 #define OP_OPMASK      (OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP)
 
                                     * per line (::) */
 #define OP_OPMASK      (OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP)
 

-#define OP_DONTCARE    0x00000008  /* Don't care if the target doesn't
+#define OP_OPTIONAL    0x00000008  /* Don't care if the target doesn't

                                     * exist and can't be created */
 #define OP_USE         0x00000010  /* Use associated commands for parents */
 #define OP_EXEC                0x00000020  /* Target is never out of date, but always
                                     * exist and can't be created */
 #define OP_USE         0x00000010  /* Use associated commands for parents */
 #define OP_EXEC                0x00000020  /* Target is never out of date, but always

diff --git a/usr/src/usr.bin/make/parse.c b/usr/src/usr.bin/make/parse.c
index 9479ea9..48b0267 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.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)parse.c    5.11 (Berkeley) %G%";

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


@@ -159,7 +159,7 @@ static struct {
 } parseKeywords[] = {
 { ".BEGIN",      Begin,        0 },
 { ".DEFAULT",    Default,      0 },
 } parseKeywords[] = {
 { ".BEGIN",      Begin,        0 },
 { ".DEFAULT",    Default,      0 },

-{ ".DONTCARE",   Attribute,    OP_DONTCARE },
+{ ".OPTIONAL",   Attribute,    OP_OPTIONAL },

 { ".END",        End,          0 },
 { ".EXEC",       Attribute,    OP_EXEC },
 { ".IGNORE",     Ignore,       OP_IGNORE },
 { ".END",        End,          0 },
 { ".EXEC",       Attribute,    OP_EXEC },
 { ".IGNORE",     Ignore,       OP_IGNORE },

diff --git a/usr/src/usr.bin/make/targ.c b/usr/src/usr.bin/make/targ.c
index 8503783..ecca92a 100644 (file)
--- a/usr/src/usr.bin/make/targ.c
+++ b/usr/src/usr.bin/make/targ.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -418,7 +418,7 @@ Targ_PrintType (type)
        type &= ~tbit;
 
        switch(tbit) {
        type &= ~tbit;
 
        switch(tbit) {

-           PRINTBIT(DONTCARE);
+           PRINTBIT(OPTIONAL);

            PRINTBIT(USE);
            PRINTBIT(EXEC);
            PRINTBIT(IGNORE);
            PRINTBIT(USE);
            PRINTBIT(EXEC);
            PRINTBIT(IGNORE);