diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
| commit | 79df573326e6911d3a97fcc2528105acd1c2c525 (patch) | |
| tree | 70930bcdb620cdf8ff9e3e9c495f67ed8317aa2e /src/expr/Makefile.am | |
| parent | 8cb3a7b556e8b4b85745bffbd1f0246e6af29588 (diff) | |
Fixes to the build system:
Makefile.am files - remove obsolete INCLUDES, incorporate into AM_CPPFLAGS
Makefile files in src/ - support "make" under src/ (current build profile)
configure.ac - updates to fix warnings
config/antlr.m4 - updates to fix warnings
autogen.sh - updates to generate warnings from autotools; also support Macs
src/include/cvc4_config.h - guard with #ifdef
total reimplementation of NodeBuilder
ExprValue => NodeValue
context_mm.{h,cpp} - fixed numerous compile errors
Diffstat (limited to 'src/expr/Makefile.am')
| -rw-r--r-- | src/expr/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index b8606e051..046281702 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -1,6 +1,7 @@ -INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CPPFLAGS = \ + -D__BUILDING_CVC4LIB \ + -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4LIB noinst_LTLIBRARIES = libexpr.la @@ -10,7 +11,7 @@ libexpr_la_SOURCES = \ node.h \ node_builder.h \ expr.h \ - expr_value.h \ + node_value.h \ node_manager.h \ expr_manager.h \ node_attribute.h \ @@ -19,6 +20,6 @@ libexpr_la_SOURCES = \ node_builder.cpp \ node_manager.cpp \ expr_manager.cpp \ - expr_value.cpp \ + node_value.cpp \ expr.cpp |