From 6c50dc9249a1abaee3d737a499833718be2e6e0a Mon Sep 17 00:00:00 2001
From: evans1629 <evans1629>
Date: Sat, 12 Apr 2003 14:42:16 +0000
Subject: [PATCH] Testing CVS setup.  Changed src/Makefile.am to reflect
 correct number of r/r conflicts.

---
 README          | 4 ++--
 src/Makefile.am | 3 +--
 src/Makefile.in | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README b/README
index af60683..2b0c699 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@
 			University of Virginia,
 		 Massachusetts Institute of Technology
 		 
-			    Version 3.0.1.7 
-			     31 March 2003
+			     Version 3.1.0
+			     12 April 2003
 
 Splint Documentation
 ====================
diff --git a/src/Makefile.am b/src/Makefile.am
index b4a45f6..024c878 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -317,8 +317,7 @@ Headers/cgrammar_tokens.h cgrammar.c: cgrammar.c.der cgrammar.y bison.head bison
 	  $(CP) cgrammar.c.der cgrammar.c; \
 	else \
 	  echo '* Making cgrammar.c'; \
-	  echo '* Expect 157 shift/reduce conflicts and 117 reduce/reduce conflicts.'; \
-	  echo '* (see cgrammar.y for explanation)'; \
+ 	  echo '*      Note: Expect 157 shift/reduce conflicts and 123 reduce/reduce conflicts. (see cgrammar.y for explanation)'; \
 	  $(BISON) $(YFLAGS) cgrammar.y; \
 	  $(CAT) bison.head cgrammar.tab.c bison.reset | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' > cgrammar.c; \
 	  $(CP) cgrammar.c cgrammar.c.der; \
diff --git a/src/Makefile.in b/src/Makefile.in
index 103e7b1..65226c0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1059,8 +1059,7 @@ Headers/cgrammar_tokens.h cgrammar.c: cgrammar.c.der cgrammar.y bison.head bison
 	  $(CP) cgrammar.c.der cgrammar.c; \
 	else \
 	  echo '* Making cgrammar.c'; \
-	  echo '* Expect 157 shift/reduce conflicts and 117 reduce/reduce conflicts.'; \
-	  echo '* (see cgrammar.y for explanation)'; \
+ 	  echo '*      Note: Expect 157 shift/reduce conflicts and 123 reduce/reduce conflicts. (see cgrammar.y for explanation)'; \
 	  $(BISON) $(YFLAGS) cgrammar.y; \
 	  $(CAT) bison.head cgrammar.tab.c bison.reset | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' > cgrammar.c; \
 	  $(CP) cgrammar.c cgrammar.c.der; \
-- 
2.45.0