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/Makefile.in | |
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/Makefile.in')
-rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 8f33fd330..38d59d02a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -159,6 +159,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -287,9 +288,8 @@ top_srcdir = @top_srcdir@ # LIBCVC4_RELEASE = @CVC4_LIBRARY_RELEASE_CODE@ LIBCVC4_VERSION = @CVC4_LIBRARY_VERSION@ -INCLUDES = -I@srcdir@/include -I@srcdir@ +AM_CPPFLAGS = AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4LIB SUBDIRS = util expr context prop smt theory . parser main lib_LTLIBRARIES = libcvc4.la libcvc4_la_LDFLAGS = -version-info $(LIBCVC4_VERSION) -release $(LIBCVC4_RELEASE) @@ -700,6 +700,8 @@ uninstall-am: uninstall-libLTLIBRARIES tags tags-recursive uninstall uninstall-am \ uninstall-libLTLIBRARIES + -D__BUILDING_CVC4LIB \ + -I@srcdir@/include -I@srcdir@ install-data-local: $(publicheaders) $(mkinstalldirs) $(DESTDIR)$(includedir)/cvc4 |