diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-11-20 23:47:56 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-11-20 23:47:56 +0000 |
commit | 95e5ca98d4c22897c0192a78ebeeb05e4838db2b (patch) | |
tree | 7bd14dc25a240bc2b4f5152c4ee7b666763dbebe /src | |
parent | cb56555734b5139f779e65cc6e628124ac6796e6 (diff) |
fixes to build/test system
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 16 | ||||
-rw-r--r-- | src/context/Makefile.am | 4 | ||||
-rw-r--r-- | src/expr/Makefile.am | 4 | ||||
-rw-r--r-- | src/expr/expr_builder.cpp | 4 | ||||
-rw-r--r-- | src/expr/expr_builder.h | 5 | ||||
-rw-r--r-- | src/main/Makefile.am | 4 | ||||
-rw-r--r-- | src/parser/Makefile.am | 4 | ||||
-rw-r--r-- | src/prop/minisat/Makefile.am | 4 | ||||
-rw-r--r-- | src/smt/Makefile.am | 4 | ||||
-rw-r--r-- | src/theory/Makefile.am | 4 | ||||
-rw-r--r-- | src/util/Makefile.am | 4 |
11 files changed, 31 insertions, 26 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 57a67d6e5..f7404e514 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,18 +1,18 @@ INCLUDES = -I@srcdir@/include -I@srcdir@ AM_CXXFLAGS = -Wall -fvisibility=hidden -SUBDIRS = util expr context prop smt theory parser main +SUBDIRS = util expr context prop smt theory . parser main lib_LTLIBRARIES = libcvc4.la +libcvc4_la_SOURCES = libcvc4_la_LIBADD = \ - util/libutil.a \ - expr/libexpr.a \ - context/libcontext.a \ - prop/minisat/libminisat.a \ - smt/libsmt.a \ - theory/libtheory.a \ - parser/libparser.a + util/libutil.la \ + expr/libexpr.la \ + context/libcontext.la \ + prop/minisat/libminisat.la \ + smt/libsmt.la \ + theory/libtheory.la EXTRA_DIST = \ include/cvc4.h \ diff --git a/src/context/Makefile.am b/src/context/Makefile.am index 00858fb7b..87a4598c4 100644 --- a/src/context/Makefile.am +++ b/src/context/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libcontext.a +noinst_LTLIBRARIES = libcontext.la -libcontext_a_SOURCES = +libcontext_la_SOURCES = diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index 17b7d8dcd..da2839ad1 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libexpr.a +noinst_LTLIBRARIES = libexpr.la -libexpr_a_SOURCES = \ +libexpr_la_SOURCES = \ expr.cpp \ expr_builder.cpp \ expr_manager.cpp \ diff --git a/src/expr/expr_builder.cpp b/src/expr/expr_builder.cpp index 3b0cf4041..c5f366654 100644 --- a/src/expr/expr_builder.cpp +++ b/src/expr/expr_builder.cpp @@ -129,10 +129,6 @@ ExprBuilder& ExprBuilder::operator<<(const Kind& op) { ExprBuilder& ExprBuilder::operator<<(const Expr& child) { } -template <class Iterator> -ExprBuilder& ExprBuilder::append(const Iterator& begin, const Iterator& end) { -} - void ExprBuilder::addChild(const Expr& e) { if(d_nchildren == nchild_thresh) { vector<Expr>* v = new vector<Expr>(); diff --git a/src/expr/expr_builder.h b/src/expr/expr_builder.h index fc303572d..07d069a9e 100644 --- a/src/expr/expr_builder.h +++ b/src/expr/expr_builder.h @@ -154,6 +154,11 @@ public: };/* class MultExprBuilder */ +template <class Iterator> +ExprBuilder& ExprBuilder::append(const Iterator& begin, const Iterator& end) { + return *this; +} + }/* CVC4 namespace */ #endif /* __CVC4__EXPR_BUILDER_H */ diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 8f400241b..cf392f6b6 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -7,3 +7,7 @@ cvc4_SOURCES = \ main.cpp \ getopt.cpp \ util.cpp + +cvc4_LDADD = \ + ../parser/libparser.la \ + ../libcvc4.la diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 2a1b83dba..8ea47d140 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. -I@builddir@ AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libparser.a +noinst_LTLIBRARIES = libparser.la -libparser_a_SOURCES = \ +libparser_la_SOURCES = \ pl_scanner.lpp \ pl.ypp \ smtlib_scanner.lpp \ diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am index 97cfc438a..db646fef4 100644 --- a/src/prop/minisat/Makefile.am +++ b/src/prop/minisat/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I@srcdir@/mtl -I@srcdir@/core -I@srcdir@/../../include AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libminisat.a -libminisat_a_SOURCES = \ +noinst_LTLIBRARIES = libminisat.la +libminisat_la_SOURCES = \ core/Solver.C \ simp/SimpSolver.C diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am index ff740aa56..c2967ad14 100644 --- a/src/smt/Makefile.am +++ b/src/smt/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libsmt.a +noinst_LTLIBRARIES = libsmt.la -libsmt_a_SOURCES = +libsmt_la_SOURCES = diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am index f022d0445..97cb116e0 100644 --- a/src/theory/Makefile.am +++ b/src/theory/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libtheory.a +noinst_LTLIBRARIES = libtheory.la -libtheory_a_SOURCES = +libtheory_la_SOURCES = diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 415893680..f25f52ac0 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -noinst_LIBRARIES = libutil.a +noinst_LTLIBRARIES = libutil.la -libutil_a_SOURCES = +libutil_la_SOURCES = |