Testing CVS setup. Changed src/Makefile.am to reflect correct number of

r/r conflicts.

diff --git a/README b/README
index af606830942f35d9226af9ffa4f42076eb144fe0..2b0c69933e8d0da6bc4035477600589ed0a3cadf 100644 (file)
--- 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 b4a45f6332d5af9669e0047157fbcde086971b71..024c878854c26a8831809ea62ce10c2eb7623222 100644 (file)
--- 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 103e7b1e520ad1b01388710e6d70df180a17faf4..65226c07ee8bf69c06079b846454e90c0fe8a2c8 100644 (file)
--- 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; \