X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j%2FMakefile.am;h=05a18d436a2029317ea7034bf6fd08e3761cb586;hb=111902ab67af0b14edfe846c32940732543dbc1a;hp=9113f85e3b0ffe5589aa75fd3000efa30c1ef920;hpb=8e57e02f3ece925cdf37006a160187993c6f1cb1;p=lttng-ust.git diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am index 9113f85e..05a18d43 100644 --- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am +++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am @@ -12,8 +12,9 @@ jardir = $(datadir)/java log4jjniout = ../../jni/log4j -dist_noinst_JAVA = $(pkgpath)/LTTngLog4j.java \ - $(pkgpath)/LTTngLogAppender.java +dist_noinst_JAVA = $(pkgpath)/LttngLog4jAgent.java \ + $(pkgpath)/LttngLog4jApi.java \ + $(pkgpath)/LttngLogAppender.java dist_noinst_DATA = $(jarfile_manifest) @@ -26,7 +27,7 @@ $(jarfile): classnoinst.stamp $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink) log4j-jni-header.stamp: $(dist_noinst_JAVA) - $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LTTngLogAppender && \ + $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \ echo "Log4j JNI header generated" > log4j-jni-header.stamp all-local: $(stamp) @@ -37,5 +38,7 @@ install-data-hook: uninstall-hook: cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) -CLEANFILES = $(jarfile) $(pkgpath)/*.class log4j-jni-header.stamp \ - $(log4jjniout)/org_lttng_ust_agent_log4j_LTTngLogAppender.h +CLEANFILES = *.jar \ + $(pkgpath)/*.class \ + log4j-jni-header.stamp \ + $(log4jjniout)/org_lttng_ust_agent_log4j_LttngLog4jApi.h