Merge branch 'master' into allow_empty

Changes for cvc_rv
d-m-bailey · Oct 4, 2022 · 0c3c2b8 · 0c3c2b8
2 parents ddaed17 + 5ce9390
commit 0c3c2b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ ylwrap
 src_py/__pycache__
 src_py/.deps
 /configure~
+src/cvc_rv
diff --git a/README.md b/README.md
@@ -28,7 +28,10 @@ Installation
 Requirements:
 - gcc 4.9.3
 - python 2.7.10
-- bison 3.3 (only if making changes to the parser or compiling from github)
+
+The following are only required if making changes to the parser or compiling from github
+- bison 3.3
+- automake 1.14.1
 
 GUI requirements:
 - kivy 1.10.0

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT(CVC, [1.1.4], [cvc@shuharisystem.com])
+AC_INIT(CVC_RV, [1.1.4], [cvc@shuharisystem.com])
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADERS([config.h])
 AC_USE_SYSTEM_EXTENSIONS

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -9,8 +9,8 @@ LDFLAGS = -static-libstdc++ -static-libgcc
 # the previous manual Makefile
 BUILT_SOURCES = cdlParser.hh stack.hh position.hh location.hh
 AM_YFLAGS = -d -Wno-yacc
-bin_PROGRAMS = cvc
-cvc_SOURCES = cvc.cc Cvc.hh \
+bin_PROGRAMS = cvc_rv
+cvc_rv_SOURCES = cvc.cc Cvc.hh \
 	cdlParser.yy cdlScanner.ll \
 	stack.hh position.hh location.hh \
 	CCdlParserDriver.cc CCdlParserDriver.hh \