From 655a0d112540df3001f9823cd3b331b8254eb2aa Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 18 Apr 2012 19:34:37 -0400 Subject: [PATCH] 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 --- Makefile.am | 7 ++++--- configure.ac | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index e231e085..c726b816 100644 --- 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 e8eec829..26227cb3 100644 --- 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 -- 2.34.1