Merge branch 'master' into strRewritesstrRewrites

4 files changed, 0 insertions, 160 deletions

diff --git a/examples/api/Makefile b/examples/api/Makefile
deleted file mode 100644
index 8e5dcfd21..000000000
--- a/examples/api/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../..
-srcdir = examples/api
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/api/Makefile.am b/examples/api/Makefile.am
deleted file mode 100644
index a36819e5c..000000000
--- a/examples/api/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-SUBDIRS = . java
-
-AM_CPPFLAGS = \
-	-I@srcdir@/../../src/include -I@srcdir@/../../src -I@builddir@/../../src $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall
-AM_CFLAGS = -Wall
-
-noinst_PROGRAMS = \
-	bitvectors \
-	bitvectors-new \
-	bitvectors_and_arrays \
-	bitvectors_and_arrays-new \
-	combination \
-	combination-new \
-	datatypes \
-	datatypes-new \
-	extract \
-	extract-new \
-	helloworld \
-	helloworld-new \
-	linear_arith \
-	linear_arith-new \
-	sets \
-	sets-new \
-	strings \
-	strings-new
-
-noinst_DATA =
-
-bitvectors_SOURCES = \
-	bitvectors.cpp
-bitvectors_LDADD = \
-	@builddir@/../../src/libcvc4.la
-bitvectors_new_SOURCES = \
-	bitvectors-new.cpp
-bitvectors_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-bitvectors_and_arrays_SOURCES = \
-	bitvectors_and_arrays.cpp
-bitvectors_and_arrays_LDADD = \
-	@builddir@/../../src/libcvc4.la
-bitvectors_and_arrays_new_SOURCES = \
-	bitvectors_and_arrays-new.cpp
-bitvectors_and_arrays_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-combination_SOURCES = \
-	combination.cpp
-combination_LDADD = \
-	@builddir@/../../src/libcvc4.la
-combination_new_SOURCES = \
-	combination-new.cpp
-combination_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-datatypes_SOURCES = \
-	datatypes.cpp
-datatypes_LDADD = \
-	@builddir@/../../src/libcvc4.la
-datatypes_new_SOURCES = \
-	datatypes-new.cpp
-datatypes_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-extract_SOURCES = \
-	extract.cpp
-extract_LDADD = \
-	@builddir@/../../src/libcvc4.la
-extract_new_SOURCES = \
-	extract-new.cpp
-extract_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-helloworld_SOURCES = \
-	helloworld.cpp
-helloworld_LDADD = \
-	@builddir@/../../src/libcvc4.la
-helloworld_new_SOURCES = \
-	helloworld-new.cpp
-helloworld_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-linear_arith_SOURCES = \
-	linear_arith.cpp
-linear_arith_LDADD = \
-	@builddir@/../../src/libcvc4.la
-linear_arith_new_SOURCES = \
-	linear_arith-new.cpp
-linear_arith_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-sets_SOURCES = \
-	sets.cpp
-sets_LDADD = \
-	@builddir@/../../src/libcvc4.la
-sets_new_SOURCES = \
-	sets-new.cpp
-sets_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-strings_SOURCES = \
-	strings.cpp
-strings_LDADD = \
-	@builddir@/../../src/libcvc4.la
-strings_new_SOURCES = \
-	strings-new.cpp
-strings_new_LDADD = \
-	@builddir@/../../src/libcvc4.la
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
diff --git a/examples/api/java/Makefile b/examples/api/java/Makefile
deleted file mode 100644
index 10a950e1c..000000000
--- a/examples/api/java/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-topdir = ../../..
-srcdir = examples/api/java
-
-include $(topdir)/Makefile.subdir
diff --git a/examples/api/java/Makefile.am b/examples/api/java/Makefile.am
deleted file mode 100644
index 6ce35b300..000000000
--- a/examples/api/java/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-noinst_DATA =
-
-if CVC4_LANGUAGE_BINDING_JAVA
-noinst_DATA += \
-	#CVC4Streams.class \  ## disabled until bindings for the new API are in place (issue #2284)
-	BitVectors.class \
-	BitVectorsAndArrays.class \
-	Combination.class \
-	HelloWorld.class \
-	LinearArith.class \
-	Datatypes.class \
-	PipedInput.class \
-	Strings.class
-endif
-
-%.class: %.java
-	$(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../../../src/bindings/CVC4.jar" -d "@builddir@" $<
-
-EXTRA_DIST = \
-	CVC4Streams.java \
-	BitVectors.java \
-	BitVectorsAndArrays.java \
-	Combination.java \
-	HelloWorld.java \
-	LinearArith.java \
-	Datatypes.java \
-	PipedInput.java \
-	Strings.java
-
-# for installation
-examplesdir = $(docdir)/$(subdir)
-examples_DATA = $(DIST_SOURCES) $(EXTRA_DIST)
-
-MOSTLYCLEANFILES = $(noinst_DATA)
-
-# for silent automake rules
-AM_V_JAVAC = $(am__v_JAVAC_$(V))
-am__v_JAVAC_ = $(am__v_JAVAC_$(AM_DEFAULT_VERBOSITY))
-am__v_JAVAC_0 = @echo "  JAVAC " $@;