From cfff0cd5c5c3abf42ab48ef90ab974e66105167f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 15 Nov 2013 12:17:02 -0500 Subject: [PATCH] Java/jul: fix make dist Signed-off-by: Mathieu Desnoyers --- liblttng-ust-java/Makefile.am | 6 +++--- liblttng-ust-jul/Makefile.am | 13 +++++++++---- tests/java-jul/Makefile.am | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am index e52bf0e2..5d43cfc7 100644 --- a/liblttng-ust-java/Makefile.am +++ b/liblttng-ust-java/Makefile.am @@ -1,3 +1,6 @@ +LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust +LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust + if BUILD_JNI_INTERFACE AM_CPPFLAGS = -I$(top_srcdir)/include @@ -8,9 +11,6 @@ nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h dist_noinst_DATA = $(LTTNG_JUST_SRCDIR)/LTTngUst.java liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust -LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust -LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust - if HAVE_JAVA_JDK JCC=$(JAVA_JDK)/bin else diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am index e4f0480b..ffcc5380 100644 --- a/liblttng-ust-jul/Makefile.am +++ b/liblttng-ust-jul/Makefile.am @@ -1,3 +1,6 @@ +LTTNG_JUL_SRCDIR = $(srcdir)/org/lttng/ust/jul +LTTNG_JUL_DESTDIR = $(builddir)/org/lttng/ust/jul + if BUILD_JNI_INTERFACE AM_CPPFLAGS = -I$(top_srcdir)/include @@ -5,14 +8,16 @@ 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_jul_LTTngUst.h -dist_noinst_DATA = $(LTTNG_JUL_SRCDIR)/LTTngUst.java +dist_noinst_DATA = $(LTTNG_JUL_SRCDIR)/LTTngUst.java \ + $(LTTNG_JUL_SRCDIR)/LTTngAgent.java \ + $(LTTNG_JUL_SRCDIR)/LTTngLogHandler.java \ + $(LTTNG_JUL_SRCDIR)/LTTngSessiondCmd2_4.java \ + $(LTTNG_JUL_SRCDIR)/LTTngTCPSessiondClient.java \ + $(LTTNG_JUL_SRCDIR)/LTTngThread.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 - if HAVE_JAVA_JDK JCC=$(JAVA_JDK)/bin else diff --git a/tests/java-jul/Makefile.am b/tests/java-jul/Makefile.am index 6d3e2aab..b4dfc4ca 100644 --- a/tests/java-jul/Makefile.am +++ b/tests/java-jul/Makefile.am @@ -1,3 +1,5 @@ +EXTRA_DIST = test_jul JULTest.java + if BUILD_JNI_INTERFACE if HAVE_JAVA_JDK @@ -8,8 +10,6 @@ endif AM_CPPFLAGS = -I$(top_srcdir)/include -EXTRA_DIST = test_jul - JUL_jar_file = "$(srcdir)/../../liblttng-ust-jul/liblttng-ust-jul.jar" default: all -- 2.34.1