ignored items

diff --git a/configure.ac b/configure.ac
index 87f1458b671c341085f0e0479db9739010d654ce..58fcdfac32fd8c0467633921a507e3c8a410e290 100644 (file)
--- 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 7b2141da38a34772314276f13db3a18bd1bc1dc0..8b897bf0fca61c3dc3cc880e33012525dd2d1f4d 100644 (file)
--- 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 (file)
index 0000000..e3226e8
--- /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 d26a7483dec3c8538b5c81cdcf628e2b7a07e692..6833f9f97898695845aa83bdcc2f1f8c0c604822 100644 (file)
--- 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 (file)
index 0000000..e857c82
--- /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 (file)
index 0000000..f719b12
--- /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 (file)
index 0000000..5c64f4f
--- /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 (file)
index 0000000..de5f0da
--- /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 =