diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-11-06 16:58:16 -0500 |
|---|---|---|
| committer | Tianyi Liang <tianyi-liang@uiowa.edu> | 2013-11-10 18:47:35 -0600 |
| commit | 726603e0e5a5482cf98538079790747e43313276 (patch) | |
| tree | 12e41e99a21a16cf9cff7374a84d9a6527f03c8b /src/printer | |
| parent | 6c6f44c32a6bb957c1e82ae75fbf62db2e286595 (diff) | |
Flatten libcvc4 build structure; remove some #include interdependences
Diffstat (limited to 'src/printer')
| -rw-r--r-- | src/printer/Makefile | 4 | ||||
| -rw-r--r-- | src/printer/Makefile.am | 27 | ||||
| -rw-r--r-- | src/printer/ast/ast_printer.cpp | 2 | ||||
| -rw-r--r-- | src/printer/cvc/cvc_printer.cpp | 2 | ||||
| -rw-r--r-- | src/printer/smt2/smt2_printer.cpp | 1 |
5 files changed, 3 insertions, 33 deletions
diff --git a/src/printer/Makefile b/src/printer/Makefile deleted file mode 100644 index 72baefbd9..000000000 --- a/src/printer/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -topdir = ../.. -srcdir = src/printer - -include $(topdir)/Makefile.subdir diff --git a/src/printer/Makefile.am b/src/printer/Makefile.am deleted file mode 100644 index cd938088e..000000000 --- a/src/printer/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -AM_CPPFLAGS = \ - -D__BUILDING_CVC4LIB \ - -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) - -noinst_LTLIBRARIES = libprinter.la - -libprinter_la_SOURCES = \ - printer.h \ - printer.cpp \ - dagification_visitor.h \ - dagification_visitor.cpp \ - model_format_mode.h \ - model_format_mode.cpp \ - ast/ast_printer.h \ - ast/ast_printer.cpp \ - smt1/smt1_printer.h \ - smt1/smt1_printer.cpp \ - smt2/smt2_printer.h \ - smt2/smt2_printer.cpp \ - cvc/cvc_printer.h \ - cvc/cvc_printer.cpp \ - tptp/tptp_printer.h \ - tptp/tptp_printer.cpp - -EXTRA_DIST = \ - options_handlers.h diff --git a/src/printer/ast/ast_printer.cpp b/src/printer/ast/ast_printer.cpp index 88c769f26..8ab5c121d 100644 --- a/src/printer/ast/ast_printer.cpp +++ b/src/printer/ast/ast_printer.cpp @@ -17,7 +17,7 @@ #include "printer/ast/ast_printer.h" #include "expr/expr.h" // for ExprSetDepth etc.. #include "util/language.h" // for LANG_AST -#include "expr/node_manager.h" // for VarNameAttr +#include "expr/node_manager_attributes.h" // for VarNameAttr #include "expr/command.h" #include "printer/dagification_visitor.h" #include "util/node_visitor.h" diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index 513ff7276..e0375e6e1 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -17,7 +17,7 @@ #include "printer/cvc/cvc_printer.h" #include "expr/expr.h" // for ExprSetDepth etc.. #include "util/language.h" // for LANG_AST -#include "expr/node_manager.h" // for VarNameAttr +#include "expr/node_manager_attributes.h" // for VarNameAttr #include "expr/command.h" #include "theory/substitutions.h" #include "smt/smt_engine.h" diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp index 756e521a6..d086caf38 100644 --- a/src/printer/smt2/smt2_printer.cpp +++ b/src/printer/smt2/smt2_printer.cpp @@ -28,6 +28,7 @@ #include "util/language.h" #include "smt/smt_engine.h" #include "smt/options.h" +#include "expr/node_manager_attributes.h" #include "theory/model.h" #include "theory/arrays/theory_arrays_rewriter.h" |