Index: ChangeLog
from  Akim Demaille  <address@hidden>

	* src/output.h, src/output.c (error_verbose): Move to...
	* src/getargs.h, src/getargs.c: here.
	Sort the flags.
	Adjust dependencies.

Index: src/getargs.c
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.c,v
retrieving revision 1.66
diff -u -r1.66 getargs.c
--- src/getargs.c 3 Jan 2006 19:12:55 -0000 1.66
+++ src/getargs.c 14 May 2006 19:13:10 -0000
@@ -46,19 +46,22 @@
 
 bool debug_flag;
 bool defines_flag;
+bool graph_flag;
 bool locations_flag;
 bool no_lines_flag;
 bool no_parser_flag;
-int report_flag = report_none;
 bool token_table_flag;
 bool yacc_flag;	/* for -y */
-bool graph_flag;
-int trace_flag = trace_none;
+
+bool error_verbose = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 bool pure_parser = false;
 
+int report_flag = report_none;
+int trace_flag = trace_none;
+
 const char *skeleton = NULL;
 const char *include = NULL;
 
Index: src/getargs.h
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.h,v
retrieving revision 1.28
diff -u -r1.28 getargs.h
--- src/getargs.h 24 Jul 2005 07:24:22 -0000 1.28
+++ src/getargs.h 14 May 2006 19:13:10 -0000
@@ -1,5 +1,5 @@
 /* Parse command line arguments for bison.
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -32,13 +32,16 @@
 
 extern bool debug_flag;			/* for -t */
 extern bool defines_flag;		/* for -d */
+extern bool graph_flag;			/* for -g */
 extern bool locations_flag;
 extern bool no_lines_flag;		/* for -l */
 extern bool no_parser_flag;		/* for -n */
 extern bool token_table_flag;		/* for -k */
-extern bool graph_flag;			/* for -g */
 extern bool yacc_flag;			/* for -y */
 
+extern bool error_verbose;
+
+
 /* GLR_PARSER is true if the input file says to use the GLR
    (Generalized LR) parser, and to output some additional information
    used by the GLR algorithm.  */
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.245
diff -u -r1.245 output.c
--- src/output.c 21 Jan 2006 04:35:09 -0000 1.245
+++ src/output.c 14 May 2006 19:13:11 -0000
@@ -43,9 +43,6 @@
 
 static struct obstack format_obstack;
 
-bool error_verbose = false;
-
-
 
 /*-------------------------------------------------------------------.
 | Create a function NAME which associates to the muscle NAME the     |
Index: src/output.h
===================================================================
RCS file: /cvsroot/bison/bison/src/output.h,v
retrieving revision 1.14
diff -u -r1.14 output.h
--- src/output.h 14 May 2005 06:49:47 -0000 1.14
+++ src/output.h 14 May 2006 19:13:11 -0000
@@ -1,5 +1,5 @@
 /* Output the generated parsing program for bison,
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,8 +21,6 @@
 #ifndef OUTPUT_H_
 # define OUTPUT_H_
 
-extern bool error_verbose;
-
 /* Output the parsing tables and the parser code to FTABLE.  */
 void output (void);
 
Index: src/parse-gram.y
===================================================================
RCS file: /cvsroot/bison/bison/src/parse-gram.y,v
retrieving revision 1.73
diff -u -r1.73 parse-gram.y
--- src/parse-gram.y 30 Jan 2006 09:00:40 -0000 1.73
+++ src/parse-gram.y 14 May 2006 19:13:12 -0000
@@ -29,7 +29,6 @@
 #include "getargs.h"
 #include "gram.h"
 #include "muscle_tab.h"
-#include "output.h"
 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.253
diff -u -r1.253 reader.c
--- src/reader.c 30 Jan 2006 07:25:59 -0000 1.253
+++ src/reader.c 14 May 2006 19:13:12 -0000
@@ -31,7 +31,6 @@
 #include "getargs.h"
 #include "gram.h"
 #include "muscle_tab.h"
-#include "output.h"
 #include "reader.h"
 #include "symlist.h"
 #include "symtab.h"