projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated org.lttng.ust.jul.LTTngAgent class
[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 5a406e4a25c9b97e0361dab69727c75f3ccf1b62..1232d6e5a560645332f84fcbe36ed6047f83030a 100644
(file)
--- a/
liblttng-ust-java-agent/java/Makefile.am
+++ b/
liblttng-ust-java-agent/java/Makefile.am
@@
-1,15
+1,12
@@
JAVAROOT = .
pkgpath = org/lttng/ust/agent
JAVAROOT = .
pkgpath = org/lttng/ust/agent
-pkgpath_old = org/lttng/ust/jul
jarfile_version = 1.0.0
jarfile_version = 1.0.0
-jarfile_manifest = $(pkgpath)/Manifest.txt
+jarfile_manifest = $(
srcdir)/$(
pkgpath)/Manifest.txt
jarfile_symlink = liblttng-ust-agent.jar
jarfile = liblttng-ust-agent-$(jarfile_version).jar
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
jardir = $(datadir)/java
juljniout = ../jni/jul
@@
-21,12
+18,11
@@
dist_noinst_JAVA = $(pkgpath)/LTTngAgent.java \
$(pkgpath)/LogFramework.java \
$(pkgpath)/LogFrameworkSkeleton.java \
$(pkgpath)/jul/LTTngJUL.java \
$(pkgpath)/LogFramework.java \
$(pkgpath)/LogFrameworkSkeleton.java \
$(pkgpath)/jul/LTTngJUL.java \
- $(pkgpath)/jul/LTTngLogHandler.java \
- $(pkgpath_old)/LTTngAgent.java
+ $(pkgpath)/jul/LTTngLogHandler.java
dist_noinst_DATA = $(jarfile_manifest)
dist_noinst_DATA = $(jarfile_manifest)
-jar_DATA = $(jarfile)
$(jarfile_old)
+jar_DATA = $(jarfile)
stamp =
classes = $(pkgpath)/*.class
stamp =
classes = $(pkgpath)/*.class
@@
-46,29
+42,25
@@
classes += $(pkgpath)/log4j/*.class
endif
$(jarfile): classnoinst.stamp
endif
$(jarfile): classnoinst.stamp
- $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && $(LN_S) $@ $(jarfile_symlink)
-
-$(jarfile_old): classnoinst.stamp
- $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
- $(pkgpath)/jul/*.class $(pkgpath_old)/*.class
+ $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
jul-jni-header.stamp: $(dist_noinst_JAVA)
jul-jni-header.stamp: $(dist_noinst_JAVA)
- $(JAVAH) -c
p
$(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LTTngLogHandler && \
+ $(JAVAH) -c
lasspath
$(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LTTngLogHandler && \
echo "JUL JNI header generated" > jul-jni-header.stamp
log4j-jni-header.stamp: $(dist_noinst_JAVA)
echo "JUL JNI header generated" > jul-jni-header.stamp
log4j-jni-header.stamp: $(dist_noinst_JAVA)
- $(JAVAH) -c
p
$(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LTTngLogAppender && \
+ $(JAVAH) -c
lasspath
$(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LTTngLogAppender && \
echo "Log4j JNI header generated" > log4j-jni-header.stamp
all-local: $(stamp)
echo "Log4j JNI header generated" > log4j-jni-header.stamp
all-local: $(stamp)
-install-data-
local
:
- cd $(DESTDIR)/$(jardir)
; rm -f $(jarfile_symlink);
$(LN_S) $(jarfile) $(jarfile_symlink)
+install-data-
hook
:
+ cd $(DESTDIR)/$(jardir)
&& rm -f $(jarfile_symlink) &&
$(LN_S) $(jarfile) $(jarfile_symlink)
-uninstall-
local
:
- cd $(DESTDIR)/$(jardir)
;
rm -f $(jarfile_symlink)
+uninstall-
hook
:
+ cd $(DESTDIR)/$(jardir)
&&
rm -f $(jarfile_symlink)
-CLEANFILES = $(jarfile) $(
jarfile_old) $(pkgpath)/*.class $(pkgpath_old
)/*.class $(pkgpath)/jul/*.class \
+CLEANFILES = $(jarfile) $(
pkgpath
)/*.class $(pkgpath)/jul/*.class \
$(pkgpath)/log4j/*.class jul-jni-header.stamp log4j-jni-header.stamp \
$(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h \
$(log4jjniout)/org_lttng_ust_agent_log4j_LTTngLogAppender.h
$(pkgpath)/log4j/*.class jul-jni-header.stamp log4j-jni-header.stamp \
$(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h \
$(log4jjniout)/org_lttng_ust_agent_log4j_LTTngLogAppender.h
This page took
0.112991 seconds
and
4
git commands to generate.