X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2FMakefile.am;h=683e451b15721cff825ee93c15662ec9f563d49a;hb=8ab5c06b92ac9a06ba2743470a38e4e1cfc6a3c9;hp=33476ae3082a3d9a1964b2293cab280df039fe70;hpb=1d193914f13dd604d60df9db680001c9a4af5f9d;p=lttng-ust.git

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 33476ae3..683e451b 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
@@ -7,8 +7,8 @@ jarfile_manifest = $(srcdir)/Manifest.txt
 jarfile_symlink = lttng-ust-agent-common.jar
 jarfile = lttng-ust-agent-common-$(jarfile_version).jar
 
-
 jardir = $(datadir)/java
+jnioutdir = ../../jni/common
 
 dist_noinst_JAVA = $(pkgpath)/AbstractLttngAgent.java \
 				   $(pkgpath)/ILttngAgent.java \
@@ -19,10 +19,13 @@ dist_noinst_JAVA = $(pkgpath)/AbstractLttngAgent.java \
 				   $(pkgpath)/client/LttngAgentResponse.java \
 				   $(pkgpath)/client/LttngTcpSessiondClient.java \
 				   $(pkgpath)/client/SessiondCommandHeader.java \
+				   $(pkgpath)/client/SessiondDisableAppContextCommand.java \
 				   $(pkgpath)/client/SessiondDisableEventCommand.java \
+				   $(pkgpath)/client/SessiondEnableAppContextCommand.java \
 				   $(pkgpath)/client/SessiondEnableEventCommand.java \
 				   $(pkgpath)/client/SessiondListLoggersCommand.java \
 				   $(pkgpath)/context/ContextInfoManager.java \
+				   $(pkgpath)/context/ContextInfoSerializer.java \
 				   $(pkgpath)/context/IContextInfoRetriever.java \
 				   $(pkgpath)/filter/FilterChangeNotifier.java \
 				   $(pkgpath)/filter/IFilterChangeListener.java \
@@ -34,12 +37,20 @@ dist_noinst_DATA = $(jarfile_manifest)
 
 jar_DATA = $(jarfile)
 
-classes = $(pkgpath)/*.class $(pkgpath)/client/*.class $(pkgpath)/context/*.class $(pkgpath)/filter/*.class $(pkgpath)/session/*.class
+classes = $(pkgpath)/*.class \
+		  $(pkgpath)/client/*.class \
+		  $(pkgpath)/context/*.class \
+		  $(pkgpath)/filter/*.class \
+		  $(pkgpath)/session/*.class
 
 $(jarfile): classnoinst.stamp
 	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
 
-all-local:
+context-jni-header.stamp: $(dist_noinst_JAVA)
+	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(jnioutdir) $(JAVAHFLAGS) org.lttng.ust.agent.context.LttngContextApi && \
+	echo "Context API JNI header generated" > context-jni-header.stamp
+
+all-local: context-jni-header.stamp
 
 install-data-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
@@ -47,4 +58,9 @@ install-data-hook:
 uninstall-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class $(pkgpath)/client/*.class $(pkgpath)/context/*.class $(pkgpath)/filter/*.class $(pkgpath)/session/*.class
+CLEANFILES = $(jarfile) $(pkgpath)/*.class \
+			 $(pkgpath)/client/*.class \
+			 $(pkgpath)/context/*.class \
+			 $(pkgpath)/filter/*.class \
+			 $(pkgpath)/session/*.class \
+			 $(juljniout)/org_lttng_ust_agent_context_LttngContextApi.h