X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust-jul%2FMakefile.am;h=e4f0480bfd863635ea2f298c2a690a76b82aed4c;hb=6490eba0f6e5e7f5a50d4707f4b60fca0cc61e1e;hp=22ba89c33ca88afa4cbe363c067e060502615c1c;hpb=43e5396b3b2247a3f57a8a797239359df3ff083f;p=lttng-ust.git

diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am
index 22ba89c3..e4f0480b 100644
--- a/liblttng-ust-jul/Makefile.am
+++ b/liblttng-ust-jul/Makefile.am
@@ -4,10 +4,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttng-ust-jul-jni.la
 liblttng_ust_jul_jni_la_SOURCES = LTTngUst.c lttng_ust_jul.h
-nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_LTTngUst.h
+nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_jul_LTTngUst.h
 dist_noinst_DATA = $(LTTNG_JUL_SRCDIR)/LTTngUst.java
 liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
+lttnglibjava_DATA = liblttng-ust-jul.jar
+
 LTTNG_JUL_SRCDIR = $(srcdir)/org/lttng/ust/jul
 LTTNG_JUL_DESTDIR = $(builddir)/org/lttng/ust/jul
 
@@ -18,14 +20,14 @@ JCC=javac
 endif
 
 all-local: $(LTTNG_JUL_DESTDIR)/LTTngAgent.class $(LTTNG_JUL_DESTDIR)/LTTngUst.class \
-		org_lttng_ust_LTTngUst.h liblttng-ust-jul.jar
+		org_lttng_ust_jul_LTTngUst.h liblttng-ust-jul.jar
 
 clean-local:
 	rm -f org_lttng_ust_jul_LTTngUst.h
 	rm -f liblttng-ust-jul.jar
 	rm -f org/lttng/ust/jul/*.class
 
-LTTngUst.c: org_lttng_ust_LTTngUst.h
+LTTngUst.c: org_lttng_ust_jul_LTTngUst.h
 
 $(LTTNG_JUL_DESTDIR)/LTTngUst.class: $(LTTNG_JUL_SRCDIR)/LTTngUst.java
 	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngUst.java"
@@ -33,7 +35,7 @@ $(LTTNG_JUL_DESTDIR)/LTTngUst.class: $(LTTNG_JUL_SRCDIR)/LTTngUst.java
 $(LTTNG_JUL_DESTDIR)/LTTngAgent.class: $(LTTNG_JUL_SRCDIR)/LTTngAgent.java
 	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngAgent.java"
 
-org_lttng_ust_LTTngUst.h: $(LTTNG_JUL_DESTDIR)/LTTngUst.class
+org_lttng_ust_jul_LTTngUst.h: $(LTTNG_JUL_DESTDIR)/LTTngUst.class
 	$(JCC)/javah org.lttng.ust.jul.LTTngUst
 
 liblttng-ust-jul.jar: $(LTTNG_JUL_DESTDIR)/LTTngUst.class $(LTTNG_JUL_DESTDIR)/LTTngAgent.class