JUL: fix out of tree build

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

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 5d43cfc713a5ccf4f28f1ab7b8e434e16424963e..37867a7cdf45b115e1ec131b2ebbf47f4ac45817 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -26,8 +26,8 @@ clean-local:
 
 LTTngUst.c: org_lttng_ust_LTTngUst.h
 
-$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_DESTDIR)/LTTngUst.java
-       $(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_DESTDIR)/LTTngUst.java"
+$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_SRCDIR)/LTTngUst.java
+       $(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_SRCDIR)/LTTngUst.java"
 
 org_lttng_ust_LTTngUst.h: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
        $(JCC)/javah org.lttng.ust.LTTngUst

diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am
index ffcc53804293818f66d58fa55e02a46ba58ec019..89c908045980858c36ddcd3c0565826617d43b17 100644 (file)
--- a/liblttng-ust-jul/Makefile.am
+++ b/liblttng-ust-jul/Makefile.am
@@ -24,8 +24,10 @@ else
 JCC=javac
 endif
 
-all-local: $(LTTNG_JUL_DESTDIR)/LTTngAgent.class $(LTTNG_JUL_DESTDIR)/LTTngUst.class \
-               org_lttng_ust_jul_LTTngUst.h liblttng-ust-jul.jar
+all-local: $(LTTNG_JUL_DESTDIR)/LTTngAgent.class \
+               $(LTTNG_JUL_DESTDIR)/LTTngUst.class \
+               org_lttng_ust_jul_LTTngUst.h \
+               liblttng-ust-jul.jar
 
 clean-local:
        rm -f org_lttng_ust_jul_LTTngUst.h
@@ -34,16 +36,23 @@ clean-local:
 
 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"
+%.class: %.java
+       $(JCC)/javac -d "$(builddir)" $<
 
-$(LTTNG_JUL_DESTDIR)/LTTngAgent.class: $(LTTNG_JUL_SRCDIR)/LTTngAgent.java
-       $(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngAgent.java"
+LTTNG_AGENT_FILES = $(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
+
+$(LTTNG_JUL_DESTDIR)/LTTngAgent.class: $(LTTNG_AGENT_FILES) \
+               $(LTTNG_JUL_DESTDIR)/LTTngUst.class
+       $(JCC)/javac -d "$(builddir)" $(LTTNG_AGENT_FILES)
 
 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
+liblttng-ust-jul.jar: $(LTTNG_JUL_DESTDIR)/LTTngAgent.class
        $(JCC)/jar cf liblttng-ust-jul.jar \
                $(LTTNG_JUL_DESTDIR)/*.class
 

diff --git a/tests/java-jul/Makefile.am b/tests/java-jul/Makefile.am
index b4dfc4caffb2aa356b14f41e860140d12298da3f..ba50fbf1360b6911a61f5cece42bf42b2b0842bc 100644 (file)
--- a/tests/java-jul/Makefile.am
+++ b/tests/java-jul/Makefile.am
@@ -10,7 +10,7 @@ endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-JUL_jar_file = "$(srcdir)/../../liblttng-ust-jul/liblttng-ust-jul.jar"
+JUL_jar_file = "$(builddir)/../../liblttng-ust-jul/liblttng-ust-jul.jar"
 
 default: all