Correctly clean all generated JAR files

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

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
index b2aed8b467d0d91e8f764597a8a96340e8485963..2b6cf2352ee44353b914e204aa25a730772184da 100644 (file)
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
@@ -12,8 +12,9 @@ jardir = $(datadir)/java
 
 juljniout = ../../jni/jul
 
-dist_noinst_JAVA = $(pkgpath)/LTTngJUL.java \
-                       $(pkgpath)/LTTngLogHandler.java
+dist_noinst_JAVA = $(pkgpath)/LttngJulAgent.java \
+                                  $(pkgpath)/LttngJulApi.java \
+                                  $(pkgpath)/LttngLogHandler.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)
 
 jul-jni-header.stamp: $(dist_noinst_JAVA)
-       $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LTTngLogHandler && \
+       $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \
        echo "JUL JNI header generated" > jul-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 jul-jni-header.stamp \
-       $(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h
+CLEANFILES = *.jar \
+       $(pkgpath)/*.class \
+       jul-jni-header.stamp \
+       $(juljniout)/org_lttng_ust_agent_jul_LttngJulApi.h