diff --git a/src/Makefile b/src/Makefile index 89724073b21..4c001a87aff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -45,7 +45,7 @@ languages: util.dir langapi.dir \ cpp.dir ansi-c.dir xmllang.dir assembler.dir \ jsil.dir json.dir json-symtab-language.dir -solvers.dir: util.dir langapi.dir +solvers.dir: util.dir goto-instrument.dir: languages goto-programs.dir pointer-analysis.dir \ goto-symex.dir linking.dir analyses.dir solvers.dir diff --git a/src/solvers/Makefile b/src/solvers/Makefile index 743613373ea..924294b3297 100644 --- a/src/solvers/Makefile +++ b/src/solvers/Makefile @@ -229,5 +229,5 @@ solvers$(LIBEXT): $(OBJ) $(SOLVER_LIB) -include $(smt2/smt2_solver$(DEPEXT)) smt2_solver$(EXEEXT): $(OBJ) smt2/smt2_solver$(OBJEXT) \ - ../util/util$(LIBEXT) ../langapi/langapi$(LIBEXT) ../big-int/big-int$(LIBEXT) $(SOLVER_LIB) + ../util/util$(LIBEXT) ../big-int/big-int$(LIBEXT) $(SOLVER_LIB) $(LINKBIN) diff --git a/src/solvers/refinement/module_dependencies.txt b/src/solvers/refinement/module_dependencies.txt index c86a2484f74..2ecb3864aa5 100644 --- a/src/solvers/refinement/module_dependencies.txt +++ b/src/solvers/refinement/module_dependencies.txt @@ -1,4 +1,3 @@ -langapi # should go away solvers/flattening solvers/floatbv solvers/refinement diff --git a/src/solvers/refinement/refine_arithmetic.cpp b/src/solvers/refinement/refine_arithmetic.cpp index 873aeeb22fb..4c3284b63a7 100644 --- a/src/solvers/refinement/refine_arithmetic.cpp +++ b/src/solvers/refinement/refine_arithmetic.cpp @@ -13,8 +13,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include - #include #include @@ -528,9 +526,5 @@ bv_refinementt::add_approximation( std::string bv_refinementt::approximationt::as_string() const { - #if 0 - return from_expr(expr); - #else return std::to_string(id_nr)+"/"+id2string(expr.id()); - #endif }