diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
| commit | 1d18e5ebed9a5b20ed6a8fe21d11842acf6fa7ea (patch) | |
| tree | 7074f04453914bc377ff6aeb307dd17b82b76ff3 /Makefile.am | |
| parent | 74770f1071e6102795393cf65dd0c651038db6b4 (diff) | |
Merge from my post-smtcomp branch. Includes:
Dumping infrastructure. Can dump preprocessed queries and clauses. Can
also dump queries (for testing with another solver) to see if any conflicts
are missed, T-propagations are missed, all lemmas are T-valid, etc. For a
full list of options see --dump=help.
CUDD building much cleaner.
Documentation and assertion fixes.
Printer improvements, printing of commands in language-defined way, etc.
Typechecker stuff in expr package now autogenerated, no need to manually
edit the expr package when adding a new theory.
CVC3 compatibility layer (builds as libcompat).
SWIG detection and language binding support (infrastructure).
Support for some Z3 extended commands (like datatypes) in SMT-LIBv2 mode
(when not in compliance mode).
Copyright and file headers regenerated.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index ecb9c6eda..5fb6ff9e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,9 @@ SUBDIRS = src test contrib .PHONY: units systemtests regress regress0 regress1 regress2 regress3 systemtests regress regress0 regress1 regress2 regress3: all - (cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 + +(cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 units: all - (cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 + +(cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 LCOV = lcov GENHTML = genhtml @@ -29,7 +29,7 @@ if COVERAGE_ENABLED # work...) lcov: all $(LCOV) -z -d . - $(MAKE) check -C test/unit + +$(MAKE) check -C test/unit $(LCOV) -c -d . -t cvc4_units -o cvc4-coverage-full.info $(LCOV) -o cvc4-coverage.info -r cvc4-coverage-full.info $(LCOV_EXCLUDES) mkdir -p "@top_srcdir@/html" @@ -40,7 +40,7 @@ lcov: all lcov-all: all $(LCOV) -z -d . - $(MAKE) check -C test + +$(MAKE) check -C test $(LCOV) -c -d . -t cvc4_units -o cvc4-coverage-full.info $(LCOV) -o cvc4-coverage.info -r cvc4-coverage-full.info $(LCOV_EXCLUDES) mkdir -p "@top_srcdir@/html" @@ -53,7 +53,7 @@ lcov-all: all # modules/test-types; unfortunately lcov 1.8 directory paths # are broken(?) or at least different than 1.7 lcov18: all - @for testtype in public black white; do \ + +@for testtype in public black white; do \ echo; echo "=== Collecting coverage data from $$testtype unit tests ==="; \ echo $(LCOV) -z -d .; \ $(LCOV) -z -d . || exit 1; \ @@ -90,6 +90,18 @@ EXTRA_DIST = \ Makefile.subdir \ config/build-type \ config/mkbuilddir \ - config/doxygen.cfg + config/doxygen.cfg \ + doc/cvc4.1.in \ + doc/cvc4.5.in \ + doc/libcvc4.3.in \ + doc/libcvc4parser.3.in \ + doc/libcvc4compat.3.in +man_MANS = \ + doc/cvc4.1 \ + doc/cvc4.5 \ + doc/libcvc4.3 \ + doc/libcvc4parser.3 \ + doc/libcvc4compat.3 + dist-hook: cp -p "$(srcdir)/Makefile" "$(distdir)/Makefile" |