From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 12 Apr 2012 18:06:14 +0000 (-0400)
Subject: Revert "Build a jar for the Java side of the JNI interface"
X-Git-Tag: v2.0.2~6
X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=bd68f05335c6f9831d1da9403b0854a7df16d2ca

Revert "Build a jar for the Java side of the JNI interface"

This reverts commit 6dcf3689333a2b465a5738c840d0b14d3f8014ea.

This should not go into stable-2.0.

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

diff --git a/liblttng-ust-java/.gitignore b/liblttng-ust-java/.gitignore
index e07ee503..677373ea 100644
--- a/liblttng-ust-java/.gitignore
+++ b/liblttng-ust-java/.gitignore
@@ -1,3 +1,2 @@
 org_lttng_ust_LTTngUst.h
 org/
-liblttng-ust-java.jar
diff --git a/liblttng-ust-java/LTTngUst.java b/liblttng-ust-java/LTTngUst.java
index 68ed120c..d3f1edaf 100644
--- a/liblttng-ust-java/LTTngUst.java
+++ b/liblttng-ust-java/LTTngUst.java
@@ -18,7 +18,7 @@
 
 package org.lttng.ust;
 
-public class LTTngUst {
+class LTTngUst {
 	public static native void tracepointString(String name, String arg);
 	static {
 		System.loadLibrary("lttng-ust-java");
diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 7e1834a6..9e01e045 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -7,11 +7,10 @@ liblttng_ust_java_la_SOURCES = LTTngUst.c org_lttng_ust_LTTngUst.h lttng_ust_jav
 dist_noinst_DATA = LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
+all: LTTngUst.class org_lttng_ust_LTTngUst.h
 
 clean-local:
-	rm org_lttng_ust_LTTngUst.h
-	rm liblttng-ust-java.jar
+	rm  org_lttng_ust_LTTngUst.h
 	rm -rf org/
 
 LTTngUst.class: LTTngUst.java
@@ -20,7 +19,4 @@ LTTngUst.class: LTTngUst.java
 org_lttng_ust_LTTngUst.h: LTTngUst.class
 	javah org.lttng.ust.LTTngUst
 
-liblttng-ust-java.jar: LTTngUst.class
-	jar cf liblttng-ust-java.jar org/*
-
 endif
diff --git a/liblttng-ust-java/README b/liblttng-ust-java/README
index 4b4d2c6e..37834e69 100644
--- a/liblttng-ust-java/README
+++ b/liblttng-ust-java/README
@@ -10,8 +10,3 @@ dependency: openjdk-6-jdk
 
 dependency: gcj-4.4-jdk
 ./configure --with-java-jdk=/usr/lib/jvm/java-gcj --with-jni-interface
-
-
-After building, you can use the liblttng-ust-java.jar file in a Java project.
-It requires the liblttng-ust-java.so* files (which get installed when doing
-`make install') so make sure those are in the linker's library path.