projects
/
deliverable
/
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
[deliverable/lttng-ust.git]
/
doc
/
examples
/
java-log4j
/
Makefile
diff --git
a/doc/examples/java-log4j/Makefile
b/doc/examples/java-log4j/Makefile
index 59ffdf79c2ed95dc322c7733dfffad669fb83948..39c2e788bf66a50964d6d610195be1a4f965e88d 100644
(file)
--- a/
doc/examples/java-log4j/Makefile
+++ b/
doc/examples/java-log4j/Makefile
@@
-27,20
+27,20
@@
endif
# Check if the top level makefile overrides the Log4j Jar file's path.
ifeq "$(JAVA_CLASSPATH_OVERRIDE_LOG4J)" ""
# Check if the top level makefile overrides the Log4j Jar file's path.
ifeq "$(JAVA_CLASSPATH_OVERRIDE_LOG4J)" ""
-
CLASSPATH:=$(CLASSPATH):
/usr/local/share/java/$(JARFILE_LOG4J):/usr/share/java/$(JARFILE_LOG4J)
+
LOG4J_CP =
/usr/local/share/java/$(JARFILE_LOG4J):/usr/share/java/$(JARFILE_LOG4J)
else
else
-
CLASSPATH:=$(CLASSPATH):
$(JAVA_CLASSPATH_OVERRIDE_LOG4J)/$(JARFILE_LOG4J)
+
LOG4J_CP =
$(JAVA_CLASSPATH_OVERRIDE_LOG4J)/$(JARFILE_LOG4J)
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):
$(LOG4J_CP):$(COMMON_CP):
."
.SUFFIXES: .java .class
.java.class:
$(JC) $(JFLAGS) $*.java
.SUFFIXES: .java .class
.java.class:
$(JC) $(JFLAGS) $*.java
This page took
0.02454 seconds
and
5
git commands to generate.