X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2FMakefile.am;h=0f74d18c8e17c82711b04baad0f10d3fe000bcd9;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=c949bf893ed438aa75cc63636fa7cf7527403488;hpb=501f6777610d7f8d855453c0083a10912d5fac4b;p=lttng-ust.git diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am index c949bf89..0f74d18c 100644 --- a/liblttng-ust-java-agent/java/Makefile.am +++ b/liblttng-ust-java-agent/java/Makefile.am @@ -1,58 +1,11 @@ -JAVAROOT = . +# SPDX-License-Identifier: LGPL-2.1-only -jarfile = liblttng-ust-agent.jar -jarfile_old = liblttng-ust-jul.jar -jardir = $(datadir)/java -juljniout = ../jni/jul -log4jjniout = ../jni/log4j -pkgpath = org/lttng/ust/agent -pkgpath_old = org/lttng/ust/jul -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 - -jar_DATA = $(jarfile) $(jarfile_old) - -stamp = -classes = $(pkgpath)/*.class +SUBDIRS = lttng-ust-agent-common lttng-ust-agent-all 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) cf $(JARFLAGS) $@ $(classes) - -$(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):. -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):. -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LTTngLogAppender && \ - echo "Log4j JNI header generated" > log4j-jni-header.stamp - -all-local: $(stamp) - -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