X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-jul%2FMakefile.am;h=bc13c76f8ba8bf212e104aa5207e0305ac51e607;hb=96caa5edeee13a015a63c6a38d075bddcb91c6c2;hp=ac3d521768f91350c79e2b58692edda144e75465;hpb=f7e770b846eb5b661edc4f0f11d2ad4851fd45ba;p=lttng-ust.git

diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am
index ac3d5217..bc13c76f 100644
--- a/liblttng-ust-jul/Makefile.am
+++ b/liblttng-ust-jul/Makefile.am
@@ -1,15 +1,24 @@
+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
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir)
 
+BUILT_SOURCES = org_lttng_ust_jul_LTTngUst.h
 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
 
-LTTNG_JUL_SRCDIR = $(srcdir)/org/lttng/ust/jul
-LTTNG_JUL_DESTDIR = $(builddir)/org/lttng/ust/jul
+lttnglibjava_DATA = liblttng-ust-jul.jar
 
 if HAVE_JAVA_JDK
 JCC=$(JAVA_JDK)/bin
@@ -17,26 +26,34 @@ 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
 	rm -f liblttng-ust-jul.jar
 	rm -f org/lttng/ust/jul/*.class
 
-LTTngUst.c: org_lttng_ust_jul_LTTngUst.h
+%.class: %.java
+	$(JCC)/javac -d "$(builddir)" $<
 
-$(LTTNG_JUL_DESTDIR)/LTTngUst.class: $(LTTNG_JUL_SRCDIR)/LTTngUst.java
-	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUL_SRCDIR)/LTTngUst.java"
+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