From 79df573326e6911d3a97fcc2528105acd1c2c525 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Wed, 16 Dec 2009 04:25:45 +0000 Subject: 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 --- src/theory/Makefile | 5 +++++ src/theory/Makefile.am | 5 +++-- src/theory/Makefile.in | 7 +++++-- src/theory/uf/Makefile | 5 +++++ src/theory/uf/Makefile.am | 5 +++-- src/theory/uf/Makefile.in | 7 +++++-- 6 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 src/theory/Makefile create mode 100644 src/theory/uf/Makefile (limited to 'src/theory') diff --git a/src/theory/Makefile b/src/theory/Makefile new file mode 100644 index 000000000..2a4a03491 --- /dev/null +++ b/src/theory/Makefile @@ -0,0 +1,5 @@ +topdir = ../.. +srcdir = src/theory +builddir = $(topdir)/$(builds)/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am index f8e9908c9..4eba7811c 100644 --- a/src/theory/Makefile.am +++ b/src/theory/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 = libtheory.la diff --git a/src/theory/Makefile.in b/src/theory/Makefile.in index 7af3f957c..d37387741 100644 --- a/src/theory/Makefile.in +++ b/src/theory/Makefile.in @@ -142,6 +142,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -253,9 +254,11 @@ 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 = \ + -D__BUILDING_CVC4LIB \ + -I@srcdir@/../include -I@srcdir@/.. + AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4LIB noinst_LTLIBRARIES = libtheory.la libtheory_la_SOURCES = \ theory_engine.h \ diff --git a/src/theory/uf/Makefile b/src/theory/uf/Makefile new file mode 100644 index 000000000..524ff2009 --- /dev/null +++ b/src/theory/uf/Makefile @@ -0,0 +1,5 @@ +topdir = ../../.. +srcdir = src/theory/uf +builddir = $(topdir)/builds/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/src/theory/uf/Makefile.am b/src/theory/uf/Makefile.am index 11c9f536e..4b36d2fe8 100644 --- a/src/theory/uf/Makefile.am +++ b/src/theory/uf/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 = libuf.la diff --git a/src/theory/uf/Makefile.in b/src/theory/uf/Makefile.in index 4920e7a0c..dfb8ea932 100644 --- a/src/theory/uf/Makefile.in +++ b/src/theory/uf/Makefile.in @@ -90,6 +90,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -201,9 +202,11 @@ 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 = \ + -D__BUILDING_CVC4LIB \ + -I@srcdir@/../../include -I@srcdir@/../.. + AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4LIB noinst_LTLIBRARIES = libuf.la libuf_la_SOURCES = all: all-am -- cgit v1.2.3