X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2FMakefile.am;h=a10a393f12b7774c168d9dfbd9c1b25f8b2b29d7;hb=8e57e02f3ece925cdf37006a160187993c6f1cb1;hp=f9344bb049f30c18123ce239d57aa8e35a3513ce;hpb=011af85c7a3956d494b798a4cb919059a6f31ac7;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am
index f9344bb0..a10a393f 100644
--- a/liblttng-ust-java-agent/java/Makefile.am
+++ b/liblttng-ust-java-agent/java/Makefile.am
@@ -1,74 +1,9 @@
-JAVAROOT = .
-
-pkgpath = org/lttng/ust/agent
-pkgpath_old = org/lttng/ust/jul
-
-jarfile_version = 1.0.0
-jarfile_manifest = $(pkgpath)/Manifest.txt
-jarfile_symlink = liblttng-ust-agent.jar
-jarfile = liblttng-ust-agent-$(jarfile_version).jar
-
-jarfile_old = liblttng-ust-jul.jar
-
-jardir = $(datadir)/java
-
-juljniout = ../jni/jul
-log4jjniout = ../jni/log4j
-
-dist_noinst_JAVA = $(pkgpath)/LTTngAgent.java \
-		   $(pkgpath)/LTTngSessiondCmd2_6.java \
-		   $(pkgpath)/LTTngTCPSessiondClient.java \
-		   $(pkgpath)/LogFramework.java \
-		   $(pkgpath)/LogFrameworkSkeleton.java \
-		   $(pkgpath)/jul/LTTngJUL.java \
-		   $(pkgpath)/jul/LTTngLogHandler.java \
-		   $(pkgpath_old)/LTTngAgent.java
-
-dist_noinst_DATA = $(jarfile_manifest)
-
-jar_DATA = $(jarfile) $(jarfile_old)
-
-stamp =
-classes = $(pkgpath)/*.class
+SUBDIRS = lttng-ust-agent-common
 
 if BUILD_JAVA_AGENT_WITH_JUL
-dist_noinst_JAVA += $(pkgpath)/jul/LTTngJUL.java \
-		    $(pkgpath)/jul/LTTngLogHandler.java
-stamp += jul-jni-header.stamp
-classes += $(pkgpath)/jul/*.class
+SUBDIRS += lttng-ust-agent-jul
 endif
 
 if BUILD_JAVA_AGENT_WITH_LOG4J
-dist_noinst_JAVA += $(pkgpath)/log4j/LTTngLog4j.java \
-		    $(pkgpath)/log4j/LTTngLogAppender.java
-stamp += log4j-jni-header.stamp
-classes += $(pkgpath)/log4j/*.class
+SUBDIRS += lttng-ust-agent-log4j
 endif
-
-$(jarfile): classnoinst.stamp
-	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
-
-$(jarfile_old): classnoinst.stamp
-	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
-	$(pkgpath)/jul/*.class $(pkgpath_old)/*.class
-
-jul-jni-header.stamp: $(dist_noinst_JAVA)
-	$(JAVAH) -cp $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LTTngLogHandler && \
-	echo "JUL JNI header generated" > jul-jni-header.stamp
-
-log4j-jni-header.stamp: $(dist_noinst_JAVA)
-	$(JAVAH) -cp $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LTTngLogAppender && \
-	echo "Log4j JNI header generated" > log4j-jni-header.stamp
-
-all-local: $(stamp)
-
-install-data-hook:
-	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
-
-uninstall-hook:
-	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
-
-CLEANFILES = $(jarfile) $(jarfile_old) $(pkgpath)/*.class $(pkgpath_old)/*.class $(pkgpath)/jul/*.class \
-	$(pkgpath)/log4j/*.class jul-jni-header.stamp log4j-jni-header.stamp \
-	$(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h \
-	$(log4jjniout)/org_lttng_ust_agent_log4j_LTTngLogAppender.h