-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