diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/context/Makefile.am | 6 | ||||
| -rw-r--r-- | src/expr/Makefile.am | 4 | ||||
| -rw-r--r-- | src/main/Makefile.am | 6 | ||||
| -rw-r--r-- | src/smt/Makefile.am | 6 | ||||
| -rw-r--r-- | src/theory/Makefile.am | 6 | ||||
| -rw-r--r-- | src/util/Makefile.am | 6 |
8 files changed, 48 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 87f1458b6..58fcdfac3 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([src/include/vc.h]) +AC_INIT([src/include/cvc4.h]) AC_CONFIG_AUX_DIR([config]) #AC_CONFIG_LIBOBJ_DIR([lib]) AC_CONFIG_MACRO_DIR([config]) @@ -44,9 +44,14 @@ AC_CONFIG_FILES([ contrib/Makefile doc/Makefile src/Makefile - src/core/Makefile + src/expr/Makefile + src/smt/Makefile + src/main/Makefile + src/prop/minisat/Makefile + src/prop/Makefile + src/util/Makefile + src/context/Makefile src/parser/Makefile - src/sat/Makefile - src/sat/minisat/Makefile + src/theory/Makefile ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 7b2141da3..8b897bf0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,17 @@ INCLUDES = -I@srcdir@/include -I@srcdir@ -SUBDIRS = core parser sat +SUBDIRS = util expr context prop smt theory parser main lib_LTLIBRARIES = libcvc4.la libcvc4_la_LIBADD = \ - core/libcore.a + util/libutil.a \ + expr/libexpr.a \ + context/libcontext.a \ + prop/minisat/libminisat.a \ + smt/libsmt.a \ + theory/libtheory.a \ parser/libparser.a - sat/minisat/libminisat.a EXTRA_DIST = \ include/cvc4.h \ diff --git a/src/context/Makefile.am b/src/context/Makefile.am new file mode 100644 index 000000000..e3226e88b --- /dev/null +++ b/src/context/Makefile.am @@ -0,0 +1,6 @@ +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CXXFLAGS = -Wall + +noinst_LIBRARIES = libcontext.a + +libcontext_a_SOURCES = diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index d26a7483d..6833f9f97 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -noinst_LIBRARIES = libcore.a +noinst_LIBRARIES = libexpr.a -libcore_a_SOURCES = \ +libexpr_a_SOURCES = \ expr.cpp \ expr_builder.cpp \ expr_manager.cpp \ diff --git a/src/main/Makefile.am b/src/main/Makefile.am new file mode 100644 index 000000000..e857c8245 --- /dev/null +++ b/src/main/Makefile.am @@ -0,0 +1,6 @@ +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CXXFLAGS = -Wall + +bin_BINARIES = cvc4 + +cvc4_SOURCES = diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am new file mode 100644 index 000000000..f719b1283 --- /dev/null +++ b/src/smt/Makefile.am @@ -0,0 +1,6 @@ +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CXXFLAGS = -Wall + +noinst_LIBRARIES = libsmt.a + +libsmt_a_SOURCES = diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am new file mode 100644 index 000000000..5c64f4f38 --- /dev/null +++ b/src/theory/Makefile.am @@ -0,0 +1,6 @@ +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CXXFLAGS = -Wall + +noinst_LIBRARIES = libtheory.a + +libtheory_a_SOURCES = diff --git a/src/util/Makefile.am b/src/util/Makefile.am new file mode 100644 index 000000000..de5f0da9d --- /dev/null +++ b/src/util/Makefile.am @@ -0,0 +1,6 @@ +INCLUDES = -I@srcdir@/../include -I@srcdir@/.. +AM_CXXFLAGS = -Wall + +noinst_LIBRARIES = libutil.a + +libutil_a_SOURCES = |