From 5e2f381b26d683691d9a040589536dc39c5831e0 Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@gmail.com>
Date: Mon, 4 Oct 2010 22:23:53 +0000
Subject: [PATCH] fix gdb issues (at least for static builds); resolves bug 194

---
 src/Makefile.am             | 15 ++++++++++-----
 src/parser/Makefile.am      | 29 +++++++++++++++++++++++++----
 test/regress/run_regression |  2 +-
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index fb337e204..944600c81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,19 +20,24 @@ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 SUBDIRS = lib expr util context theory prop smt . parser main
 
 lib_LTLIBRARIES = libcvc4.la
-
 noinst_LTLIBRARIES = libcvc4_noinst.la
 
 libcvc4_la_LDFLAGS = -version-info $(LIBCVC4_VERSION)
-libcvc4_la_LINK = $(CXXLINK)
-
-libcvc4_la_SOURCES =
-libcvc4_la_LIBADD = libcvc4_noinst.la
 
 # empty.cpp is a fake file added to "trick" automake into linking us as a
 # C++ library (rather than as a C library, which messes up exception
 # handling support)
+libcvc4_la_SOURCES = empty.cpp
 libcvc4_noinst_la_SOURCES = empty.cpp
+libcvc4_la_LIBADD = \
+	@builddir@/util/libutil.la \
+	@builddir@/expr/libexpr.la \
+	@builddir@/context/libcontext.la \
+	@builddir@/prop/libprop.la \
+	@builddir@/prop/minisat/libminisat.la \
+	@builddir@/smt/libsmt.la \
+	@builddir@/theory/libtheory.la \
+	@builddir@/lib/libreplacements.la
 libcvc4_noinst_la_LIBADD = \
 	@builddir@/util/libutil.la \
 	@builddir@/expr/libexpr.la \
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index dbb6e559f..0533200fa 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -24,17 +24,38 @@ noinst_LTLIBRARIES = libcvc4parser_noinst.la
 
 libcvc4parser_la_LDFLAGS = $(ANTLR_LDFLAGS) \
 	-version-info $(LIBCVC4PARSER_VERSION)
-libcvc4parser_la_LIBADD = libcvc4parser_noinst.la
-libcvc4parser_la_LINK = $(CXXLINK)
-
 libcvc4parser_noinst_la_LDFLAGS = $(ANTLR_LDFLAGS)
+
+libcvc4parser_la_LIBADD = \
+	@builddir@/smt/libparsersmt.la \
+	@builddir@/smt2/libparsersmt2.la \
+	@builddir@/cvc/libparsercvc.la \
+	@builddir@/../lib/libreplacements.la
 libcvc4parser_noinst_la_LIBADD = \
 	@builddir@/smt/libparsersmt.la \
 	@builddir@/smt2/libparsersmt2.la \
 	@builddir@/cvc/libparsercvc.la \
 	@builddir@/../lib/libreplacements.la
 
-libcvc4parser_la_SOURCES =
+libcvc4parser_la_SOURCES = \
+	antlr_input.h \
+	antlr_input.cpp \
+	antlr_input_imports.cpp \
+	bounded_token_buffer.h \
+	bounded_token_buffer.cpp \
+	bounded_token_factory.h \
+	bounded_token_factory.cpp \
+	input.h \
+	input.cpp \
+	memory_mapped_input_buffer.h \
+	memory_mapped_input_buffer.cpp \
+	parser.h \
+	parser.cpp \
+	parser_builder.h \
+	parser_builder.cpp \
+	parser_options.h \
+	parser_exception.h
+
 libcvc4parser_noinst_la_SOURCES = \
 	antlr_input.h \
 	antlr_input.cpp \
diff --git a/test/regress/run_regression b/test/regress/run_regression
index b26792a78..ebef82cf1 100755
--- a/test/regress/run_regression
+++ b/test/regress/run_regression
@@ -132,7 +132,7 @@ cvc4base=`basename "$cvc4"`
 cvc4full="$cvc4dirfull/$cvc4base"
 echo  running $cvc4full `basename "$benchmark"` from `dirname "$benchmark"`
 ( cd `dirname "$benchmark"`;
-  "$cvc4full" --segv-nospin `basename "$benchmark"`;
+  "$cvc4full" $CVC4_REGRESSION_ARGS --segv-nospin `basename "$benchmark"`;
   echo $? >"$exitstatusfile"
 ) > "$outfile" 2> "$errfile"
 
-- 
2.30.2