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/main | |
| 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/main')
| -rw-r--r-- | src/main/Makefile | 5 | ||||
| -rw-r--r-- | src/main/Makefile.am | 4 | ||||
| -rw-r--r-- | src/main/Makefile.in | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/main/Makefile b/src/main/Makefile new file mode 100644 index 000000000..686674906 --- /dev/null +++ b/src/main/Makefile @@ -0,0 +1,5 @@ +topdir = ../.. +srcdir = src/main +builddir = $(topdir)/builds/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 6b8ea928c..f5b76fcfb 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -1,6 +1,6 @@ -INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CPPFLAGS = \ + -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = bin_PROGRAMS = cvc4 diff --git a/src/main/Makefile.in b/src/main/Makefile.in index ba924109e..26ea81859 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -106,6 +106,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -217,9 +218,10 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CPPFLAGS = \ + -I@srcdir@/../include -I@srcdir@/.. + AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = cvc4_SOURCES = \ main.cpp \ getopt.cpp \ |