* tests/Makefile.am (package.m4): Move to...

($(srcdir)/$(TESTSUITE)): here.

ChangeLog

@@ -1,3 +1,8 @@
+2001-09-21  Akim Demaille  <akim@epita.fr>
+
+	* tests/Makefile.am (package.m4): Move to...
+	($(srcdir)/$(TESTSUITE)): here.
+
 2001-09-20  Akim Demaille  <akim@epita.fr>
 
 	* src/complain.c: No longer try to be standalone: use system.h.

doc/bison.info

@@ -31,115 +31,115 @@ instead of in the original English.
 
 Indirect:
 bison.info-1: 1313
-bison.info-2: 50688
+bison.info-2: 50691
-bison.info-3: 100578
+bison.info-3: 100581
-bison.info-4: 150128
+bison.info-4: 150131
-bison.info-5: 197515
+bison.info-5: 197908
 
 Tag Table:
 (Indirect)
 Node: Top1313
-Node: Introduction8966
+Node: Introduction8969
-Node: Conditions10241
+Node: Conditions10244
-Node: Copying11705
+Node: Copying11708
-Node: Concepts30908
+Node: Concepts30911
-Node: Language and Grammar31987
+Node: Language and Grammar31990
-Node: Grammar in Bison37003
+Node: Grammar in Bison37006
-Node: Semantic Values38927
+Node: Semantic Values38930
-Node: Semantic Actions41028
+Node: Semantic Actions41031
-Node: Locations Overview42217
+Node: Locations Overview42220
-Node: Bison Parser43664
+Node: Bison Parser43667
-Node: Stages45976
+Node: Stages45979
-Node: Grammar Layout47259
+Node: Grammar Layout47262
-Node: Examples48516
+Node: Examples48519
-Node: RPN Calc49714
+Node: RPN Calc49717
-Node: Rpcalc Decls50688
+Node: Rpcalc Decls50691
-Node: Rpcalc Rules52275
+Node: Rpcalc Rules52278
-Node: Rpcalc Input54075
+Node: Rpcalc Input54078
-Node: Rpcalc Line55536
+Node: Rpcalc Line55539
-Node: Rpcalc Expr56651
+Node: Rpcalc Expr56654
-Node: Rpcalc Lexer58596
+Node: Rpcalc Lexer58599
-Node: Rpcalc Main61168
+Node: Rpcalc Main61171
-Node: Rpcalc Error61566
+Node: Rpcalc Error61569
-Node: Rpcalc Gen62574
+Node: Rpcalc Gen62577
-Node: Rpcalc Compile63723
+Node: Rpcalc Compile63726
-Node: Infix Calc64598
+Node: Infix Calc64601
-Node: Simple Error Recovery67305
+Node: Simple Error Recovery67308
-Node: Location Tracking Calc69194
+Node: Location Tracking Calc69197
-Node: Ltcalc Decls69924
+Node: Ltcalc Decls69927
-Node: Ltcalc Rules70833
+Node: Ltcalc Rules70836
-Node: Ltcalc Lexer72894
+Node: Ltcalc Lexer72897
-Node: Multi-function Calc75232
+Node: Multi-function Calc75235
-Node: Mfcalc Decl76799
+Node: Mfcalc Decl76802
-Node: Mfcalc Rules78822
+Node: Mfcalc Rules78825
-Node: Mfcalc Symtab80202
+Node: Mfcalc Symtab80205
-Node: Exercises86575
+Node: Exercises86578
-Node: Grammar File87081
+Node: Grammar File87084
-Node: Grammar Outline87929
+Node: Grammar Outline87932
-Node: C Declarations88663
+Node: C Declarations88666
-Node: Bison Declarations89243
+Node: Bison Declarations89246
-Node: Grammar Rules89655
+Node: Grammar Rules89658
-Node: C Code90115
+Node: C Code90118
-Node: Symbols91045
+Node: Symbols91048
-Node: Rules96126
+Node: Rules96129
-Node: Recursion97765
+Node: Recursion97768
-Node: Semantics99484
+Node: Semantics99487
-Node: Value Type100578
+Node: Value Type100581
-Node: Multiple Types101250
+Node: Multiple Types101253
-Node: Actions102267
+Node: Actions102270
-Node: Action Types105052
+Node: Action Types105055
-Node: Mid-Rule Actions106355
+Node: Mid-Rule Actions106358
-Node: Locations111925
+Node: Locations111928
-Node: Location Type112573
+Node: Location Type112576
-Node: Actions and Locations113131
+Node: Actions and Locations113134
-Node: Location Default Action115287
+Node: Location Default Action115290
-Node: Declarations116750
+Node: Declarations116753
-Node: Token Decl118069
+Node: Token Decl118072
-Node: Precedence Decl120082
+Node: Precedence Decl120085
-Node: Union Decl121633
+Node: Union Decl121636
-Node: Type Decl122477
+Node: Type Decl122480
-Node: Expect Decl123383
+Node: Expect Decl123386
-Node: Start Decl124929
+Node: Start Decl124932
-Node: Pure Decl125307
+Node: Pure Decl125310
-Node: Decl Summary126984
+Node: Decl Summary126987
-Node: Multiple Parsers132367
+Node: Multiple Parsers132370
-Node: Interface133861
+Node: Interface133864
-Node: Parser Function134733
+Node: Parser Function134736
-Node: Lexical135568
+Node: Lexical135571
-Node: Calling Convention136974
+Node: Calling Convention136977
-Node: Token Values139745
+Node: Token Values139748
-Node: Token Positions140894
+Node: Token Positions140897
-Node: Pure Calling141779
+Node: Pure Calling141782
-Node: Error Reporting144711
+Node: Error Reporting144714
-Node: Action Features146833
+Node: Action Features146836
-Node: Algorithm150128
+Node: Algorithm150131
-Node: Look-Ahead152421
+Node: Look-Ahead152424
-Node: Shift/Reduce154553
+Node: Shift/Reduce154556
-Node: Precedence157465
+Node: Precedence157468
-Node: Why Precedence158116
+Node: Why Precedence158119
-Node: Using Precedence159981
+Node: Using Precedence159984
-Node: Precedence Examples160949
+Node: Precedence Examples160952
-Node: How Precedence161650
+Node: How Precedence161653
-Node: Contextual Precedence162799
+Node: Contextual Precedence162802
-Node: Parser States164590
+Node: Parser States164593
-Node: Reduce/Reduce165833
+Node: Reduce/Reduce165836
-Node: Mystery Conflicts169394
+Node: Mystery Conflicts169397
-Node: Stack Overflow172780
+Node: Stack Overflow172783
-Node: Error Recovery174153
+Node: Error Recovery174156
-Node: Context Dependency179289
+Node: Context Dependency179292
-Node: Semantic Tokens180137
+Node: Semantic Tokens180140
-Node: Lexical Tie-ins183154
+Node: Lexical Tie-ins183157
-Node: Tie-in Recovery184702
+Node: Tie-in Recovery184705
-Node: Debugging186874
+Node: Debugging186877
-Node: Invocation190175
+Node: Invocation190178
-Node: Bison Options191427
+Node: Bison Options191430
-Node: Environment Variables195039
+Node: Environment Variables195398
-Node: Option Cross Key195887
+Node: Option Cross Key196246
-Node: VMS Invocation196731
+Node: VMS Invocation197124
-Node: Table of Symbols197515
+Node: Table of Symbols197908
-Node: Glossary205154
+Node: Glossary205547
-Node: Copying This Manual211458
+Node: Copying This Manual211851
-Node: GNU Free Documentation License211667
+Node: GNU Free Documentation License212060
-Node: Index231532
+Node: Index231925
 
 End Tag Table

doc/bison.info-1

@@ -34,7 +34,8 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
-   This manual documents version 1.29a of Bison, updated 29 August 2001.
+   This manual documents version 1.29a of Bison, updated 20 September
+2001.
 
 * Menu:
 

doc/bison.info-4

@@ -1152,12 +1152,16 @@ Tuning the parser:
 Adjust the output:
 
 `-d'
-`--defines'
      Pretend that `%verbose' was specified, i.e., write an extra output
      file containing macro definitions for the token type names defined
      in the grammar and the semantic value type `YYSTYPE', as well as a
      few `extern' variable declarations.  *Note Decl Summary::.
 
+`--defines=DEFINES-FILE'
+     The behaviour of -DEFINES is the same than `-d'. The only
+     difference is that it has an optionnal argument which is the name
+     of the output filename.
+
 `-b FILE-PREFIX'
 `--file-prefix=PREFIX'
      Specify a prefix to use for all Bison output file names.  The
@@ -1177,11 +1181,15 @@ Adjust the output:
      described under the `-v' and `-d' options.
 
 `-g'
-`--graph'
      Output a VCG definition of the LALR(1) grammar automaton computed
      by Bison. If the grammar file is `foo.y', the VCG output file will
      be `foo.vcg'.
 
+`--graph=GRAPH-FILE'
+     The behaviour of -GRAPH is the same than `-g'. The only difference
+     is that it has an optionnal argument which is the name of the
+     output graph filename.
+
 
 File: bison.info,  Node: Environment Variables,  Next: Option Cross Key,  Prev: Bison Options,  Up: Invocation
 
@@ -1214,9 +1222,10 @@ Option Cross Key
 find the corresponding short option.
 
      --debug                               -t
-     --defines                             -d
+     --defines=DEFINES-FILE          -d
      --file-prefix=PREFIX                  -b FILE-PREFIX
      --fixed-output-files --yacc           -y
+     --graph=GRAPH-FILE              -d
      --help                                -h
      --name-prefix=PREFIX                  -p NAME-PREFIX
      --no-lines                            -l

doc/stamp-vti

@@ -1,4 +1,4 @@
-@set UPDATED 29 August 2001
+@set UPDATED 20 September 2001
-@set UPDATED-MONTH August 2001
+@set UPDATED-MONTH September 2001
 @set EDITION 1.29a
 @set VERSION 1.29a

doc/version.texi

@@ -1,4 +1,4 @@
-@set UPDATED 29 August 2001
+@set UPDATED 20 September 2001
-@set UPDATED-MONTH August 2001
+@set UPDATED-MONTH September 2001
 @set EDITION 1.29a
 @set VERSION 1.29a

tests/Makefile.am

@@ -31,6 +31,14 @@ TESTSUITE = $(srcdir)/testsuite
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+	{					\
+	  echo '# Signature of the current package.'; \
+	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >package.m4
 	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
 	mv $@.tmp $@
 
@@ -49,17 +57,3 @@ check-local: atconfig atlocal $(TESTSUITE)
 # Run the test suite on the *installed* tree.
 installcheck-local:
 	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-package.m4: $(top_srcdir)/configure.in
-	{					\
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >package.m4

tests/Makefile.in

@@ -229,6 +229,14 @@ uninstall-am: uninstall-info-am
 	uninstall uninstall-am uninstall-info-am
 
 $(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+	{					\
+	  echo '# Signature of the current package.'; \
+	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >package.m4
 	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
 	mv $@.tmp $@
 
@@ -247,16 +255,6 @@ check-local: atconfig atlocal $(TESTSUITE)
 # Run the test suite on the *installed* tree.
 installcheck-local:
 	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
-
-package.m4: $(top_srcdir)/configure.in
-	{					\
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >package.m4
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: