diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-12-04 21:03:50 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-12-04 21:03:50 +0000 |
commit | 49c66a500e7252c58e8967d3d9d38d53a95a5318 (patch) | |
tree | 31d5fc7f54ef4fb403d7d4b32bb7e54dde1b86e4 /src | |
parent | a11573cc35202e579c46cd6da478e89321840482 (diff) |
more build system work
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 14 | ||||
-rw-r--r-- | src/context/context.cpp | 13 | ||||
-rw-r--r-- | src/parser/Makefile.am | 14 | ||||
-rw-r--r-- | src/parser/smt/Makefile.am | 14 |
4 files changed, 41 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b79eddf8b..128e47bd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,13 +8,13 @@ lib_LTLIBRARIES = libcvc4.la libcvc4_la_SOURCES = libcvc4_la_LIBADD = \ - util/libutil.la \ - expr/libexpr.la \ - context/libcontext.la \ - prop/libprop.la \ - prop/minisat/libminisat.la \ - smt/libsmt.la \ - theory/libtheory.la + @builddir@/util/libutil.la \ + @builddir@/expr/libexpr.la \ + @builddir@/context/libcontext.la \ + @builddir@/prop/libprop.la \ + @builddir@/prop/minisat/libminisat.la \ + @builddir@/smt/libsmt.la \ + @builddir@/theory/libtheory.la publicheaders = \ include/cvc4.h \ diff --git a/src/context/context.cpp b/src/context/context.cpp new file mode 100644 index 000000000..005c3bd6a --- /dev/null +++ b/src/context/context.cpp @@ -0,0 +1,13 @@ +/********************* -*- C++ -*- */ +/** context.cpp + ** This file is part of the CVC4 prototype. + ** Copyright (c) 2009 The Analysis of Computer Systems Group (ACSys) + ** Courant Institute of Mathematical Sciences + ** New York University + ** See the file COPYING in the top-level source directory for licensing + ** information. + ** + **/ + +#include "context/context.h" + diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index d44c970d2..7eb52d3e9 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -1,12 +1,16 @@ -INCLUDES = -I@srcdir@/../include -I@srcdir@/.. -I@builddir@ $(ANTLR_INCLUDES) +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. $(ANTLR_INCLUDES) AM_CXXFLAGS = -Wall -fvisibility=hidden AM_CPPFLAGS = -D__BUILDING_CVC4LIB -SUBDIRS = smt . +if USE_ANTLR + SUBDIRS = smt +endif nobase_lib_LTLIBRARIES = libcvc4parser.la libcvc4parser_la_LDFLAGS = $(ANTLR_LDFLAGS) +libcvc4parser_la_LIBADD = \ + ../libcvc4.la libcvc4parser_la_SOURCES = \ parser.cpp \ @@ -15,9 +19,13 @@ libcvc4parser_la_SOURCES = \ pl_scanner.lpp \ pl.ypp \ smtlib_scanner.lpp \ - smtlib.ypp \ + smtlib.ypp + +if USE_ANTLR +libcvc4parser_la_SOURCES += \ antlr_parser.cpp \ antlr_parser.h +endif USE_ANTLR BUILT_SOURCES = \ pl_scanner.cpp \ diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index 54e3e9bf9..bb2018e2e 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -1,6 +1,12 @@ -SOURCES = \ +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CXXFLAGS = -Wall -fvisibility=hidden +AM_CPPFLAGS = -D__BUILDING_CVC4LIB + +noinst_LTLIBRARIES = libparsersmt.la + +libparsersmt_la_SOURCES = \ SmtLexer.g \ - SmtParser.g + SmtParser.g \ SmtLexer.hpp \ SmtLexer.cpp \ SmtParser.hpp \ @@ -13,7 +19,7 @@ BUILT_SOURCES = \ SmtParser.cpp SmtLexer.cpp SmtLexer.hpp: SmtLexer.g - $(ANTLR) SmtLexer.g + $(ANTLR) @srcdir@/SmtLexer.g SmtParser.cpp SmtParser.hpp: SmtParser.g - $(ANTLR) SmtParser.g + $(ANTLR) @srcdir@/SmtParser.g |