rename DONTCARE as OPTIONAL

[unix-history] / usr / src / usr.bin / make / make.h

diff --git a/usr/src/usr.bin/make/make.h b/usr/src/usr.bin/make/make.h
index 7e30f14..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.5 (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


@@ -272,7 +272,6 @@ extern Boolean      queryFlag;      /* TRUE if we aren't supposed to really make
                                 * anything, just see if the targets are out-
                                 * of-date */
 
                                 * anything, just see if the targets are out-
                                 * of-date */
 

-extern Boolean noWarnings;     /* TRUE if should not print warning messages */

 extern Boolean checkEnvFirst;  /* TRUE if environment should be searched for
                                 * variables before the global context */
 
 extern Boolean checkEnvFirst;  /* TRUE if environment should be searched for
                                 * variables before the global context */
 


@@ -289,51 +288,39 @@ extern char       var_Error[];    /* Value returned by Var_Parse when an error
 extern time_t  now;            /* The time at the start of this whole
                                 * process */
 
 extern time_t  now;            /* The time at the start of this whole
                                 * process */
 

-/*
- * Three levels of compatibility. amMake incorporates backwards and oldVars,
- * backwards incorporates oldVars.
- */
-extern Boolean amMake;         /* Go all the way to backwards compatibility:
-                                *      - Depth-first traversal of the graph
-                                *      - No paralellism */
-extern Boolean  backwards;     /* Go halfway to backwards compatibility:
-                                *      - One shell per command */

 extern Boolean oldVars;        /* Do old-style variable substitution */
 extern Boolean oldVars;        /* Do old-style variable substitution */

-extern Boolean  sysVmake;      /* Imitate System V make in anything weird */

 
 /*
 
 /*

- * Debug control:
- *     There is one bit per module. It is up to the module what debug
+ * debug control:
+ *     There is one bit per module.  It is up to the module what debug

  *     information to print.
  *     information to print.

- *     DEBUG(module) returns TRUE if debugging is on for that module.

  */
  */

-extern int     debug;
-#define DEBUG_SUFF     0x00000001
-#define DEBUG_MAKE     0x00000002
-#define DEBUG_JOB      0x00000004
-#define DEBUG_TARG     0x00000008
-#define DEBUG_DIR      0x00000010
-#define DEBUG_VAR      0x00000020
-#define DEBUG_COND     0x00000040
-#define DEBUG_PARSE    0x00000080
-#define DEBUG_RMT      0x00000100
-#define DEBUG_ARCH     0x00000200
-
-#ifndef __STDC__
+extern int debug;
+#define        DEBUG_ARCH      0x0001
+#define        DEBUG_COND      0x0002
+#define        DEBUG_DIR       0x0004
+#define        DEBUG_GRAPH1    0x0008
+#define        DEBUG_GRAPH2    0x0010
+#define        DEBUG_JOB       0x0020
+#define        DEBUG_MAKE      0x0040
+#define        DEBUG_PARSE     0x0080
+#define        DEBUG_SUFF      0x0100
+#define        DEBUG_TARG      0x0200
+#define        DEBUG_VAR       0x0400
+
+#ifdef __STDC__
+#define CONCAT(a,b)    a##b
+#else

 #define I(a)           a
 #define CONCAT(a,b)    I(a)b
 #define I(a)           a
 #define CONCAT(a,b)    I(a)b

-#else
-#define CONCAT(a,b)    a##b

 #endif /* __STDC__ */
 
 #endif /* __STDC__ */
 

-#define DEBUG(module)  (debug & CONCAT(DEBUG_,module))
+#define        DEBUG(module)   (debug & CONCAT(DEBUG_,module))

 
 /*
  * Since there are so many, all functions that return non-integer values are
  * extracted by means of a sed script or two and stuck in the file "nonints.h"
  */
 
 /*
  * Since there are so many, all functions that return non-integer values are
  * extracted by means of a sed script or two and stuck in the file "nonints.h"
  */

-#include       "nonints.h"
-
-extern char *malloc();
+#include "nonints.h"

 
 #endif _MAKE_H_
 
 #endif _MAKE_H_