Fix: drop unusable liblttng-ust-java.so

There is no java class installed onto the system anyway, so it was
dependent on having access to the build tree to use it. And
documentation only sits in the build tree, so instead of installing a
.so that cannot be used, and is not documented, remove it from the
package for 2.0.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/Makefile.am b/Makefile.am
index e231e085d9dfdb4e7a76ea2d50a5418262ea107e..c726b81696e26deedb923a2e176a6cde0bfd2f5d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,10 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
                tests \
                doc
 
-if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java
-endif
+#disabled for 2.0
+#if BUILD_JNI_INTERFACE
+#SUBDIRS += liblttng-ust-java
+#endif
 
 #temporarily disabled
 # liblttng-ust-malloc

diff --git a/configure.ac b/configure.ac
index e8eec829fff8e0052b04921516467efa9f92248c..26227cb314e8950ee1132bf9eebd1badbdc76720 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -255,6 +255,8 @@ AS_IF([test "x$with_sdt" = "xyes"],[
        #tests/exit-fast/Makefile
        #tests/basic_long/Makefile
 
+#      liblttng-ust-java/Makefile
+
 AC_CONFIG_FILES([
        Makefile
        doc/Makefile
@@ -267,7 +269,6 @@ AC_CONFIG_FILES([
        liblttng-ust/Makefile
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
-       liblttng-ust-java/Makefile
        liblttng-ust-libc-wrapper/Makefile
        tools/Makefile
        tests/Makefile