Minor fixes to build system.

diff --git a/contrib/get-antlr-3.4 b/contrib/get-antlr-3.4
index 1fcdfed4aeb960e84234c9070ed935ccbd606609..7a8f64f697113c98f3360d1d74dccc78805a2ec3 100755 (executable)
--- 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 90c8a3b42159574b4491093cc542c8e3fbd0f50c..80e65d18041d37a106107726df1fc5d4ab2b30c5 100644 (file)
--- 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 567c691fe82edc23c3e69f73d2bc32d0f55d10c1..404774c629438ec6c683ce2122eb3cabfc8a8d4a 100644 (file)
--- 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 c279a3d26e15d21b99f6ced53d6978a992fbe245..90867abc9c2ea52d56386b6bf22347f5db103efc 100644 (file)
--- 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) $<