disable test cvc3_main, attempt to fix dist_check

diff --git a/src/Makefile.am b/src/Makefile.am
index 86067d3ef7922399a67a68f5bb995cab17b42f54..279e52e09e63d00c7cc2d1e9887c1fc067c1054e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -220,12 +220,16 @@ libcvc4_la_SOURCES = \
        theory/datatypes/theory_datatypes.h \
        theory/datatypes/datatypes_rewriter.h \
        theory/datatypes/theory_datatypes.cpp \
-       theory/sets/theory_sets.h \
+       theory/sets/expr_patterns.h \
+       theory/sets/options_handlers.h \
+       theory/sets/term_info.h \
        theory/sets/theory_sets.cpp \
-       theory/sets/theory_sets_private.h \
+       theory/sets/theory_sets.h \
        theory/sets/theory_sets_private.cpp \
-       theory/sets/theory_sets_rewriter.h \
+       theory/sets/theory_sets_private.h \
        theory/sets/theory_sets_rewriter.cpp \
+       theory/sets/theory_sets_rewriter.h \
+       theory/sets/theory_sets_type_enumerator.h \
        theory/sets/theory_sets_type_rules.h \
        theory/strings/theory_strings.h \
        theory/strings/theory_strings.cpp \

diff --git a/src/theory/sets/Makefile b/src/theory/sets/Makefile
deleted file mode 100644 (file)
index 68a2c5c..0000000
--- a/src/theory/sets/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = src/theory/sets
-
-include $(topdir)/Makefile.subdir

diff --git a/src/theory/sets/Makefile.am b/src/theory/sets/Makefile.am
deleted file mode 100644 (file)
index 0067862..0000000
--- a/src/theory/sets/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_CPPFLAGS = \
-       -D__BUILDING_CVC4LIB \
-       -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
-
-noinst_LTLIBRARIES = libsets.la
-
-libsets_la_SOURCES = \
-       theory_sets.h \
-       theory_sets.cpp \
-       theory_sets_private.h \
-       theory_sets_private.cpp \
-       theory_sets_rewriter.h \
-       theory_sets_rewriter.cpp \
-       theory_sets_type_rules.h \
-       theory_set_type_enumerator.h
-
-EXTRA_DIST = \
-       kinds \
-       options_handlers.h

diff --git a/test/system/Makefile.am b/test/system/Makefile.am
index 90867abc9c2ea52d56386b6bf22347f5db103efc..0306afa683cf7337671d26a7229e098d0a1a25a5 100644 (file)
--- a/test/system/Makefile.am
+++ b/test/system/Makefile.am
@@ -8,8 +8,8 @@ CPLUSPLUS_TESTS = \
        statistics
 
 if CVC4_BUILD_LIBCOMPAT
-CPLUSPLUS_TESTS += \
-       cvc3_main
+#CPLUSPLUS_TESTS += \
+#      cvc3_main
 endif
 
 TESTS = $(CPLUSPLUS_TESTS)