X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2FMakefile;h=59ffdf79c2ed95dc322c7733dfffad669fb83948;hb=b1035e615d2283d13fc7598e64a9e82f068a37c8;hp=e174e3182d91a582c2a03ae5590d55a0737c2cea;hpb=501f6777610d7f8d855453c0083a10912d5fac4b;p=lttng-ust.git

diff --git a/doc/examples/java-log4j/Makefile b/doc/examples/java-log4j/Makefile
index e174e318..59ffdf79 100644
--- a/doc/examples/java-log4j/Makefile
+++ b/doc/examples/java-log4j/Makefile
@@ -16,25 +16,31 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 #
 
-JFLAGS = -g
+# Required JAR files for Log4j
+JARFILE_LOG4J=lttng-ust-agent-log4j.jar
+JARFILE_COMMON=lttng-ust-agent-common.jar
 
-# Default JUL jar name.
-JARFILE=liblttng-ust-agent.jar
-LOG4J=/usr/share/java/log4j.jar
+# If system classpath is empty, try to guess log4j location
+ifeq "$(CLASSPATH)" ""
+	CLASSPATH=/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar
+endif
 
-# Check if the top level makefile overrides the JUL Jar file name.
-ifneq "$(JAVA_JARFILE_OVERRIDE)" ""
-	JARFILE=$(JAVA_JARFILE_OVERRIDE)
+# 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)
+else
+	CLASSPATH:=$(CLASSPATH):$(JAVA_CLASSPATH_OVERRIDE_LOG4J)/$(JARFILE_LOG4J)
 endif
 
-# Check if the top level makefile overrides the JUL classpath.
-ifeq "$(JAVA_CLASSPATH_OVERRIDE)" ""
-	CLASSPATH=/usr/local/share/java/$(JARFILE):/usr/share/java/$(JARFILE):$(LOG4J)
+# 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)
 else
-	CLASSPATH=$(JAVA_CLASSPATH_OVERRIDE)/$(JARFILE):$(LOG4J)
+	CLASSPATH:=$(CLASSPATH):$(JAVA_CLASSPATH_OVERRIDE_COMMON)/$(JARFILE_COMMON)
 endif
 
-JC = javac -cp "$(CLASSPATH):."
+JFLAGS = -g
+JC = javac -classpath "$(CLASSPATH):."
 .SUFFIXES: .java .class
 .java.class:
 	$(JC) $(JFLAGS) $*.java