Correctly clean all generated JAR files

Compatibility symlinks should also be cleaned correctly by "make clean".
Also cleanup the generated .stamp file that was added to the -common
package.

Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am
index cf3f3c3b88e46c10afa1f3ab97945c4e3730e19a..b154a63232268ff28fefedd2ae9d99febf9cba42 100644 (file)
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am
@@ -27,3 +27,5 @@ install-data-hook:
 
 uninstall-hook:
        cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && rm -f $(jarfile_compat_symlink)
+
+CLEANFILES = *.jar

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
index ecc31bee0f502f674d4139987c58bef8773e0ce6..26b2ef25ca67b12ce87633b986d6b14cc4d86c1c 100644 (file)
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
@@ -62,10 +62,12 @@ install-data-hook:
 uninstall-hook:
        cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class \
+CLEANFILES = *.jar \
+                        $(pkgpath)/*.class \
                         $(pkgpath)/client/*.class \
                         $(pkgpath)/context/*.class \
                         $(pkgpath)/filter/*.class \
                         $(pkgpath)/session/*.class \
                         $(pkgpath)/utils/*.class \
-                        $(juljniout)/org_lttng_ust_agent_context_LttngContextApi.h
+                        context-jni-header.stamp \
+                        $(jnioutdir)/org_lttng_ust_agent_context_LttngContextApi.h

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 c0316e23a65b9ffeaa6d8196cd4121076f156feb..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
@@ -38,5 +38,7 @@ install-data-hook:
 uninstall-hook:
        cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class jul-jni-header.stamp \
+CLEANFILES = *.jar \
+       $(pkgpath)/*.class \
+       jul-jni-header.stamp \
        $(juljniout)/org_lttng_ust_agent_jul_LttngJulApi.h

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 c05f2129f9d2e63dc2be48dcfd1503cdc6ff6d6e..05a18d436a2029317ea7034bf6fd08e3761cb586 100644 (file)
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
@@ -38,5 +38,7 @@ install-data-hook:
 uninstall-hook:
        cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class log4j-jni-header.stamp \
+CLEANFILES = *.jar \
+       $(pkgpath)/*.class \
+       log4j-jni-header.stamp \
        $(log4jjniout)/org_lttng_ust_agent_log4j_LttngLog4jApi.h