X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2FMakefile;h=39c2e788bf66a50964d6d610195be1a4f965e88d;hb=e494a9cdf17705bddf2169adf3945ed2ae335db9;hp=bf10fc525b4b6f717f7aa8dcf333c8eaa672ec29;hpb=8e57e02f3ece925cdf37006a160187993c6f1cb1;p=lttng-ust.git diff --git a/doc/examples/java-log4j/Makefile b/doc/examples/java-log4j/Makefile index bf10fc52..39c2e788 100644 --- a/doc/examples/java-log4j/Makefile +++ b/doc/examples/java-log4j/Makefile @@ -22,25 +22,25 @@ JARFILE_COMMON=lttng-ust-agent-common.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" + CLASSPATH=/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar endif # 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 - 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)" "" - 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):$(LOG4J_CP):$(COMMON_CP):." .SUFFIXES: .java .class .java.class: $(JC) $(JFLAGS) $*.java