projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Java Agent JAR file symlink should be created after objects install
[lttng-ust.git]
/
liblttng-ust-java-agent
/
java
/
Makefile.am
diff --git
a/liblttng-ust-java-agent/java/Makefile.am
b/liblttng-ust-java-agent/java/Makefile.am
index 01e81e5740b7578c15195a1b58b364278b845b41..f9344bb049f30c18123ce239d57aa8e35a3513ce 100644
(file)
--- a/
liblttng-ust-java-agent/java/Makefile.am
+++ b/
liblttng-ust-java-agent/java/Makefile.am
@@
-1,12
+1,20
@@
JAVAROOT = .
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
jarfile_old = liblttng-ust-jul.jar
+
jardir = $(datadir)/java
jardir = $(datadir)/java
+
juljniout = ../jni/jul
log4jjniout = ../jni/log4j
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 \
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
$(pkgpath)/jul/LTTngLogHandler.java \
$(pkgpath_old)/LTTngAgent.java
+dist_noinst_DATA = $(jarfile_manifest)
+
jar_DATA = $(jarfile) $(jarfile_old)
stamp =
jar_DATA = $(jarfile) $(jarfile_old)
stamp =
@@
-36,7
+46,7
@@
classes += $(pkgpath)/log4j/*.class
endif
$(jarfile): classnoinst.stamp
endif
$(jarfile): classnoinst.stamp
- $(JAR) cf
$(JARFLAGS) $@ $(classes
)
+ $(JAR) cf
m $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink
)
$(jarfile_old): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
$(jarfile_old): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
@@
-52,6
+62,12
@@
log4j-jni-header.stamp: $(dist_noinst_JAVA)
all-local: $(stamp)
all-local: $(stamp)
+install-data-hook:
+ cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
+
+uninstall-hook:
+ 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 \
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 \
This page took
0.023644 seconds
and
4
git commands to generate.