Fix: add LTTngEvent class to fix delayed logger

[lttng-ust.git] / liblttng-ust-jul / Makefile.am

diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am
index e4f0480bfd863635ea2f298c2a690a76b82aed4c..9b86caae28c71486ae3494563ea3e8e2adfa1771 100644 (file)
--- 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,22 +8,27 @@ 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)/LTTngEvent.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
 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
@@ -29,16 +37,24 @@ 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_AGENT_FILES = $(LTTNG_JUL_SRCDIR)/LTTngAgent.java \
+               $(LTTNG_JUL_SRCDIR)/LTTngLogHandler.java \
+               $(LTTNG_JUL_SRCDIR)/LTTngEvent.java \
+               $(LTTNG_JUL_SRCDIR)/LTTngSessiondCmd2_4.java \
+               $(LTTNG_JUL_SRCDIR)/LTTngTCPSessiondClient.java \
+               $(LTTNG_JUL_SRCDIR)/LTTngThread.java
 
-$(LTTNG_JUL_DESTDIR)/LTTngAgent.class: $(LTTNG_JUL_SRCDIR)/LTTngAgent.java
-       $(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngAgent.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