diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-03-15 20:32:13 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-03-15 20:32:13 +0000 |
| commit | 8fb7c711588cb070c1e4a1d076b47f9277bfc3fe (patch) | |
| tree | cedd18e59b24d8b6adf79bb6581b66b1af23d17a /src/util/Makefile.am | |
| parent | 1bdb81e52c7865f89663f97f6bc1244f3e4f6b12 (diff) | |
Merge from cudd branch. This mostly just adds support for linking
against cudd libraries, the propositional_query class (in util/),
which uses cudd if it's available (and otherwise answers UNKNOWN for
all queries), and the arith theory support for it (currently disabled
per Tim's request, so he can clean it up).
Other changes include:
* contrib/debug-keys - script to print all used keys under Debug(), Trace()
* test/regress/run_regression - minor fix (don't export a variable)
* configure.ac - replace a comment removed by dejan's google perf commit
* some minor copyright/documentation updates, and minor changes to source
text to make 'clang --analyze' happy.
Diffstat (limited to 'src/util/Makefile.am')
| -rw-r--r-- | src/util/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 4f853b9e3..c94d208d2 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -3,7 +3,12 @@ AM_CPPFLAGS = \ -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -noinst_LTLIBRARIES = libutil.la +noinst_LTLIBRARIES = libutil.la libutilcudd.la + +# libutilcudd.la is a separate library so that we can pass separate +# compiler flags +libutilcudd_la_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) @CUDD_CPPFLAGS@ +libutilcudd_la_LIBADD = @CUDD_LDFLAGS@ libutil_la_SOURCES = \ Assert.h \ @@ -34,6 +39,11 @@ libutil_la_SOURCES = \ dynamic_array.h \ language.h \ triple.h +libutil_la_LIBADD = \ + @builddir@/libutilcudd.la +libutilcudd_la_SOURCES = \ + propositional_query.h \ + propositional_query.cpp BUILT_SOURCES = \ rational.h \ |