diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-11-19 01:37:55 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-11-19 01:37:55 +0000 |
| commit | 663a6edef6b65d400e2d97dc9c8276da3d3cb0b1 (patch) | |
| tree | 29c7782beaf37ea855b9bc9436d61e94f60c9393 /src/Makefile.am | |
| parent | c21ad20770c41ece116c182d97e0ef824e7b26f4 (diff) | |
Merge from ufprop branch, including:
* Theory::staticLearning() for statically adding new T-stuff before
normal preprocessing. UF's staticLearning() does transitivity of
equality/iff, solving the diamonds.
* more aggressive T-propagation for UF
* new KEEP_STATISTIC macro to hide Theories from having to
register/deregister statistics (and also has the advantage of
keeping the statistic type, field name, and the 'tag' used to output
the statistic in the same place---instead of scattered in the theory
definition and constructor initializer list. See documentation for
KEEP_STATISTIC in src/util/stats.h for more of an explanation).
* more statistics for UF
* restart notifications from SAT (through TheoryEngine) via
Theory::notifyRestart()
* StackingMap and UnionFind unit tests
* build fixes/adjustments
* code cleanup; minor other improvements
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 48e052eef..d65ddc570 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,11 +24,12 @@ noinst_LTLIBRARIES = libcvc4_noinst.la libcvc4_la_LDFLAGS = -version-info $(LIBCVC4_VERSION) -# 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 +# This "tricks" automake into linking us as a C++ library (rather than +# as a C library, which messes up exception handling support) +nodist_EXTRA_libcvc4_noinst_la_SOURCES = dummy.cpp +nodist_EXTRA_libcvc4_la_SOURCES = dummy.cpp +libcvc4_noinst_la_SOURCES = +libcvc4_la_SOURCES = libcvc4_la_LIBADD = \ @builddir@/util/libutil.la \ @builddir@/expr/libexpr.la \ @@ -56,9 +57,6 @@ EXTRA_DIST = \ include/cvc4_private.h \ include/cvc4_public.h -# empty.cpp hack; see above -empty.cpp:; touch empty.cpp - publicheaders = \ include/cvc4_public.h \ include/cvc4parser_public.h |