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/smt | |
| parent | 6c6f44c32a6bb957c1e82ae75fbf62db2e286595 (diff) | |
Flatten libcvc4 build structure; remove some #include interdependences
Diffstat (limited to 'src/smt')
| -rw-r--r-- | src/smt/Makefile | 4 | ||||
| -rw-r--r-- | src/smt/Makefile.am | 32 | ||||
| -rw-r--r-- | src/smt/boolean_terms.cpp | 3 | ||||
| -rw-r--r-- | src/smt/model_postprocessor.cpp | 1 |
4 files changed, 2 insertions, 38 deletions
diff --git a/src/smt/Makefile b/src/smt/Makefile deleted file mode 100644 index 7103b6d21..000000000 --- a/src/smt/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -topdir = ../.. -srcdir = src/smt - -include $(topdir)/Makefile.subdir diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am deleted file mode 100644 index 45c2e4924..000000000 --- a/src/smt/Makefile.am +++ /dev/null @@ -1,32 +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 = libsmt.la - -libsmt_la_SOURCES = \ - smt_engine.cpp \ - smt_engine.h \ - model_postprocessor.cpp \ - model_postprocessor.h \ - smt_engine_scope.cpp \ - smt_engine_scope.h \ - command_list.cpp \ - command_list.h \ - modal_exception.h \ - boolean_terms.h \ - boolean_terms.cpp \ - logic_exception.h \ - simplification_mode.h \ - simplification_mode.cpp - -nodist_libsmt_la_SOURCES = \ - smt_options.cpp - -EXTRA_DIST = \ - options_handlers.h \ - smt_options_template.cpp \ - modal_exception.i \ - logic_exception.i \ - smt_engine.i diff --git a/src/smt/boolean_terms.cpp b/src/smt/boolean_terms.cpp index 9f1b9c1a6..1157c464e 100644 --- a/src/smt/boolean_terms.cpp +++ b/src/smt/boolean_terms.cpp @@ -22,8 +22,7 @@ #include "theory/booleans/boolean_term_conversion_mode.h" #include "theory/booleans/options.h" #include "expr/kind.h" -#include "util/hash.h" -#include "util/bool.h" +#include "expr/node_manager_attributes.h" #include "util/ntuple.h" #include <string> #include <algorithm> diff --git a/src/smt/model_postprocessor.cpp b/src/smt/model_postprocessor.cpp index c61a61940..686ecbbe6 100644 --- a/src/smt/model_postprocessor.cpp +++ b/src/smt/model_postprocessor.cpp @@ -16,6 +16,7 @@ #include "smt/model_postprocessor.h" #include "smt/boolean_terms.h" +#include "expr/node_manager_attributes.h" using namespace std; using namespace CVC4; |