From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Fri, 10 Mar 2017 18:51:39 +0000 (-0500)
Subject: Correctly clean all generated JAR files
X-Git-Tag: v2.10.0-rc1~10
X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=c373fb6169a7dc5bab0036e2085155088321ef8b

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 cf3f3c3b..b154a632 100644
--- 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 ecc31bee..26b2ef25 100644
--- 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 c0316e23..2b6cf235 100644
--- 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 c05f2129..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
@@ -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