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 f4dacdd621ee0699f3e770605a7cdcca565b080f..5a594ff3e2f200ef3d62f5cfa25d2c78fa5826e2 100644 (file)
--- a/doc/examples/java-jul/Makefile
+++ b/doc/examples/java-jul/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
 #
 # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED OR
@@ -22,25 +22,25 @@ 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)" ""
-       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
-       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)" ""
-       CLASSPATH:=$(CLASSPATH):/usr/local/share/java/$(JARFILE_COMMON):/usr/share/java/$(JARFILE_COMMON)
+       COMMON_CP = /usr/local/share/java/$(JARFILE_COMMON):/usr/share/java/$(JARFILE_COMMON)
 else
-       CLASSPATH:=$(CLASSPATH):$(JAVA_CLASSPATH_OVERRIDE_COMMON)/$(JARFILE_COMMON)
+       COMMON_CP = $(JAVA_CLASSPATH_OVERRIDE_COMMON)/$(JARFILE_COMMON)
 endif
 
 JFLAGS = -g
-JC = javac -classpath "$(CLASSPATH):."
+JC = javac -classpath "$(CLASSPATH):$(JUL_CP):$(COMMON_CP):."
 .SUFFIXES: .java .class
 .java.class:
        $(JC) $(JFLAGS) $*.java
 
-CLASSES = Hello.java FilterChangeListenerExample.java
+CLASSES = Hello.java FilterChangeListenerExample.java ApplicationContextExample.java
 
 all: classes