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 examples CLASSPATH override
[lttng-ust.git]
/
doc
/
examples
/
java-jul
/
Makefile
diff --git
a/doc/examples/java-jul/Makefile
b/doc/examples/java-jul/Makefile
index 8597c7af51e99ea1d809029bb0638926768690f0..5a594ff3e2f200ef3d62f5cfa25d2c78fa5826e2 100644
(file)
--- a/
doc/examples/java-jul/Makefile
+++ b/
doc/examples/java-jul/Makefile
@@
-22,20
+22,20
@@
JARFILE_COMMON=lttng-ust-agent-common.jar
# Check if the top level makefile overrides the JUL Jar file's path.
ifeq "$(JAVA_CLASSPATH_OVERRIDE_JUL)" ""
# Check if the top level makefile overrides the JUL Jar file's path.
ifeq "$(JAVA_CLASSPATH_OVERRIDE_JUL)" ""
-
CLASSPATH=
/usr/local/share/java/$(JARFILE_JUL):/usr/share/java/$(JARFILE_JUL)
+
JUL_CP =
/usr/local/share/java/$(JARFILE_JUL):/usr/share/java/$(JARFILE_JUL)
else
else
-
CLASSPATH=
$(JAVA_CLASSPATH_OVERRIDE_JUL)/$(JARFILE_JUL)
+
JUL_CP =
$(JAVA_CLASSPATH_OVERRIDE_JUL)/$(JARFILE_JUL)
endif
# Check if the top level makefile overrides the Common Jar file's path.
ifeq "$(JAVA_CLASSPATH_OVERRIDE_COMMON)" ""
endif
# Check if the top level makefile overrides the Common Jar file's path.
ifeq "$(JAVA_CLASSPATH_OVERRIDE_COMMON)" ""
- C
LASSPATH:=$(CLASSPATH):
/usr/local/share/java/$(JARFILE_COMMON):/usr/share/java/$(JARFILE_COMMON)
+ C
OMMON_CP =
/usr/local/share/java/$(JARFILE_COMMON):/usr/share/java/$(JARFILE_COMMON)
else
else
- C
LASSPATH:=$(CLASSPATH):
$(JAVA_CLASSPATH_OVERRIDE_COMMON)/$(JARFILE_COMMON)
+ C
OMMON_CP =
$(JAVA_CLASSPATH_OVERRIDE_COMMON)/$(JARFILE_COMMON)
endif
JFLAGS = -g
endif
JFLAGS = -g
-JC = javac -classpath "$(CLASSPATH):."
+JC = javac -classpath "$(CLASSPATH):
$(JUL_CP):$(COMMON_CP):
."
.SUFFIXES: .java .class
.java.class:
$(JC) $(JFLAGS) $*.java
.SUFFIXES: .java .class
.java.class:
$(JC) $(JFLAGS) $*.java
This page took
0.026448 seconds
and
4
git commands to generate.