X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2FMakefile.am;h=5a406e4a25c9b97e0361dab69727c75f3ccf1b62;hb=85e091331484d860fc5f781e645341f37875b6ab;hp=01e81e5740b7578c15195a1b58b364278b845b41;hpb=0bc36e5dfad79b745fe45c4176b8474ab69cf758;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am
index 01e81e57..5a406e4a 100644
--- a/liblttng-ust-java-agent/java/Makefile.am
+++ b/liblttng-ust-java-agent/java/Makefile.am
@@ -1,12 +1,20 @@
 JAVAROOT = .
 
-jarfile = liblttng-ust-agent.jar
+pkgpath = org/lttng/ust/agent
+pkgpath_old = org/lttng/ust/jul
+
+jarfile_version = 1.0.0
+jarfile_manifest = $(pkgpath)/Manifest.txt
+jarfile_symlink = liblttng-ust-agent.jar
+jarfile = liblttng-ust-agent-$(jarfile_version).jar
+
 jarfile_old = liblttng-ust-jul.jar
+
 jardir = $(datadir)/java
+
 juljniout = ../jni/jul
 log4jjniout = ../jni/log4j
-pkgpath = org/lttng/ust/agent
-pkgpath_old = org/lttng/ust/jul
+
 dist_noinst_JAVA = $(pkgpath)/LTTngAgent.java \
 		   $(pkgpath)/LTTngSessiondCmd2_6.java \
 		   $(pkgpath)/LTTngTCPSessiondClient.java \
@@ -16,6 +24,8 @@ dist_noinst_JAVA = $(pkgpath)/LTTngAgent.java \
 		   $(pkgpath)/jul/LTTngLogHandler.java \
 		   $(pkgpath_old)/LTTngAgent.java
 
+dist_noinst_DATA = $(jarfile_manifest)
+
 jar_DATA = $(jarfile) $(jarfile_old)
 
 stamp =
@@ -36,7 +46,7 @@ classes += $(pkgpath)/log4j/*.class
 endif
 
 $(jarfile): classnoinst.stamp
-	$(JAR) cf $(JARFLAGS) $@ $(classes)
+	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && $(LN_S) $@ $(jarfile_symlink)
 
 $(jarfile_old): classnoinst.stamp
 	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
@@ -52,6 +62,12 @@ log4j-jni-header.stamp: $(dist_noinst_JAVA)
 
 all-local: $(stamp)
 
+install-data-local:
+	cd $(DESTDIR)/$(jardir); rm -f $(jarfile_symlink); $(LN_S) $(jarfile) $(jarfile_symlink)
+
+uninstall-local:
+	cd $(DESTDIR)/$(jardir); rm -f $(jarfile_symlink)
+
 CLEANFILES = $(jarfile) $(jarfile_old) $(pkgpath)/*.class $(pkgpath_old)/*.class $(pkgpath)/jul/*.class \
 	$(pkgpath)/log4j/*.class jul-jni-header.stamp log4j-jni-header.stamp \
 	$(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h \