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 | |
| parent | da9eec6aa0fc0f6c29f2c3fdb08bd45ba9c27808 (diff) | |
Minor fixes to build system.
| -rwxr-xr-x | contrib/get-antlr-3.4 | 6 | ||||
| -rw-r--r-- | src/bindings/Makefile.am | 6 | ||||
| -rw-r--r-- | src/bindings/compat/java/include/cvc3/JniUtils.h | 2 | ||||
| -rw-r--r-- | test/system/Makefile.am | 7 |
4 files changed, 10 insertions, 11 deletions
diff --git a/contrib/get-antlr-3.4 b/contrib/get-antlr-3.4 index 1fcdfed4a..7a8f64f69 100755 --- a/contrib/get-antlr-3.4 +++ b/contrib/get-antlr-3.4 @@ -84,9 +84,9 @@ awk '/^old_library=/ {print "old_library='\''libantlr3c-static.a'\''"} /^library set +x cd .. -echo -echo Invalidating generated parsers.. -touch src/parser/*/*.g +# echo +# echo Invalidating generated parsers.. +# touch src/parser/*/*.g if [ ${MACHINE_TYPE} == 'x86_64' ]; then # 64-bit stuff here 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); } diff --git a/test/system/Makefile.am b/test/system/Makefile.am index c279a3d26..90867abc9 100644 --- a/test/system/Makefile.am +++ b/test/system/Makefile.am @@ -43,8 +43,8 @@ TEST_DEPS_NODIST = \ if CVC4_BUILD_LIBCOMPAT TEST_DEPS_NODIST += \ - $(abs_top_builddir)/src/compat/libcvc4compat.la \ - cvc3_george.lo + $(abs_top_builddir)/src/compat/libcvc4compat.la +# cvc3_george.lo endif TEST_DEPS = \ @@ -89,9 +89,6 @@ $(filter-out %.class.lo,$(TESTS:%=%.lo)): %.lo: %.cpp $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS) -c -o $@ $+ $(filter-out %.class,$(TESTS)): %: %.lo $(LIBADD) $(AM_V_CXXLD)$(system_LINK) $(LIBADD) $(AM_LDFLAGS) $(LIBS) $< -cvc3_main: cvc3_george.lo $(LIBADD) -#cvc3_main: $(LIBADD) -# $(AM_V_CXXLD)$(system_LINK) $(LIBADD) $(AM_LDFLAGS) $(LIBS) $+ CVC4JavaTest.class: CVC4JavaTest.java @abs_top_builddir@/src/bindings/CVC4.jar @abs_top_builddir@/src/bindings/java/libcvc4jni.la $(AM_V_JAVAC)$(JAVAC) -classpath @abs_top_builddir@/src/bindings/CVC4.jar -d $(builddir) $< |