diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-09-28 16:46:13 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-09-28 16:46:13 +0000 |
commit | c0c351a89871e0a6881668fa1a8d87349ab8af8e (patch) | |
tree | 2fb912cfd9e29b7cbfc2b97f09a5581831168984 /src | |
parent | ad0a71e2782bc291ba9f808d24df2e1d8ca1b41e (diff) |
* fix compatibility library naming for SMT-LIBv1
* change name of JNI library to "libcvc4jni", which works better with Java's
System.loadLibrary().
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src')
-rw-r--r-- | src/bindings/Makefile.am | 12 | ||||
-rw-r--r-- | src/compat/cvc3_compat.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index 82c45fe92..65961b019 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -55,12 +55,12 @@ csharplib_LTLIBRARIES = rubylib_LTLIBRARIES = tcllib_LTLIBRARIES = if CVC4_LANGUAGE_BINDING_JAVA -javalib_LTLIBRARIES += java/CVC4.la +javalib_LTLIBRARIES += java/libcvc4jni.la javadata_DATA += CVC4.jar -java_CVC4_la_LDFLAGS = \ +java_libcvc4jni_la_LDFLAGS = \ -module \ -version-info $(LIBCVC4BINDINGS_VERSION) -java_CVC4_la_LIBADD = \ +java_libcvc4jni_la_LIBADD = \ -L@builddir@/.. -lcvc4 \ -L@builddir@/../parser -lcvc4parser endif @@ -137,8 +137,8 @@ tcl_CVC4_la_LIBADD = \ -L@builddir@/../parser -lcvc4parser endif -nodist_java_CVC4_la_SOURCES = java.cpp -java_CVC4_la_CXXFLAGS = -fno-strict-aliasing +nodist_java_libcvc4jni_la_SOURCES = java.cpp +java_libcvc4jni_la_CXXFLAGS = -fno-strict-aliasing nodist_csharp_CVC4_la_SOURCES = csharp.cpp nodist_perl_CVC4_la_SOURCES = perl.cpp nodist_php_CVC4_la_SOURCES = php.cpp @@ -164,7 +164,7 @@ MOSTLYCLEANFILES = \ $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) \ CVC4.jar -java_CVC4_la-java.lo java.lo: java.cpp +java_libcvc4jni_la-java.lo java.lo: java.cpp $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) -o $@ $< CVC4.jar: java.cpp $(AM_V_GEN) \ diff --git a/src/compat/cvc3_compat.h b/src/compat/cvc3_compat.h index c140d2994..31d914b58 100644 --- a/src/compat/cvc3_compat.h +++ b/src/compat/cvc3_compat.h @@ -472,7 +472,7 @@ public: typedef CVC4::Statistics Statistics; #define PRESENTATION_LANG ::CVC4::language::input::LANG_CVC4 -#define SMTLIB_LANG ::CVC4::language::input::LANG_SMTLIB +#define SMTLIB_LANG ::CVC4::language::input::LANG_SMTLIB_V1 #define SMTLIB_V2_LANG ::CVC4::language::input::LANG_SMTLIB_V2 #define TPTP_LANG ::CVC4::language::input::LANG_TPTP #define AST_LANG ::CVC4::language::input::LANG_AST |