Correctly clean all generated JAR files

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

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 683e451b15721cff825ee93c15662ec9f563d49a..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
@@ -11,6 +11,7 @@ jardir = $(datadir)/java
 jnioutdir = ../../jni/common
 
 dist_noinst_JAVA = $(pkgpath)/AbstractLttngAgent.java \
+                                  $(pkgpath)/EventNamePattern.java \
                                   $(pkgpath)/ILttngAgent.java \
                                   $(pkgpath)/ILttngHandler.java \
                                   $(pkgpath)/LTTngAgent.java \
@@ -24,13 +25,15 @@ dist_noinst_JAVA = $(pkgpath)/AbstractLttngAgent.java \
                                   $(pkgpath)/client/SessiondEnableAppContextCommand.java \
                                   $(pkgpath)/client/SessiondEnableEventCommand.java \
                                   $(pkgpath)/client/SessiondListLoggersCommand.java \
+                                  $(pkgpath)/context/LttngContextApi.java \
                                   $(pkgpath)/context/ContextInfoManager.java \
                                   $(pkgpath)/context/ContextInfoSerializer.java \
                                   $(pkgpath)/context/IContextInfoRetriever.java \
                                   $(pkgpath)/filter/FilterChangeNotifier.java \
                                   $(pkgpath)/filter/IFilterChangeListener.java \
                                   $(pkgpath)/session/EventRule.java \
-                                  $(pkgpath)/session/LogLevelSelector.java
+                                  $(pkgpath)/session/LogLevelSelector.java \
+                                  $(pkgpath)/utils/LttngUstAgentLogger.java
 
 
 dist_noinst_DATA = $(jarfile_manifest)
@@ -41,7 +44,8 @@ classes = $(pkgpath)/*.class \
                  $(pkgpath)/client/*.class \
                  $(pkgpath)/context/*.class \
                  $(pkgpath)/filter/*.class \
-                 $(pkgpath)/session/*.class
+                 $(pkgpath)/session/*.class \
+                 $(pkgpath)/utils/*.class
 
 $(jarfile): classnoinst.stamp
        $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
@@ -58,9 +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 \
-                        $(juljniout)/org_lttng_ust_agent_context_LttngContextApi.h
+                        $(pkgpath)/utils/*.class \
+                        context-jni-header.stamp \
+                        $(jnioutdir)/org_lttng_ust_agent_context_LttngContextApi.h