diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-07-30 12:37:04 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-07-30 14:26:06 -0400 |
| commit | 02e72e5f97086214afc6684e300f73f8ec50ab2c (patch) | |
| tree | b1b6d5d59aa944d5137c93eb68a45b42f967c952 /src/bindings | |
| parent | da9eec6aa0fc0f6c29f2c3fdb08bd45ba9c27808 (diff) | |
Minor fixes to build system.
Diffstat (limited to 'src/bindings')
| -rw-r--r-- | src/bindings/Makefile.am | 6 | ||||
| -rw-r--r-- | src/bindings/compat/java/include/cvc3/JniUtils.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index 90c8a3b42..80e65d180 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -171,8 +171,10 @@ MOSTLYCLEANFILES = \ $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) \ CVC4.jar -#java_libcvc4jni_la-java.lo java.lo: java.cpp -# $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $< +java_libcvc4jni_la-java.lo: java.cpp + $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $< +java.lo: java.cpp + $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) $(java_libcvc4jni_la_CXXFLAGS) -o $@ $< CVC4.jar: java.cpp $(AM_V_GEN) \ (cd java && \ diff --git a/src/bindings/compat/java/include/cvc3/JniUtils.h b/src/bindings/compat/java/include/cvc3/JniUtils.h index 567c691fe..404774c62 100644 --- a/src/bindings/compat/java/include/cvc3/JniUtils.h +++ b/src/bindings/compat/java/include/cvc3/JniUtils.h @@ -109,7 +109,7 @@ namespace Java_cvc3_JniUtils { // embeds a c++ object into a jobject, // and takes over the responsibility to deallocate it template <class T> jobject embed_own(JNIEnv* env, T* cobj) { - DebugAssert(&cobj != NULL, "JniUtils::embed_own: null object given"); + DebugAssert(cobj != NULL, "JniUtils::embed_own: null object given"); return embed<T>(env, cobj, typeid(cobj), &DeleteEmbedded<T>::deleteEmbedded); } |