X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2FMakefile;fp=doc%2Fexamples%2Fjava-log4j%2FMakefile;h=39c2e788bf66a50964d6d610195be1a4f965e88d;hb=9f1d7029482a337e009c0c1b001a903edd87d15c;hp=59ffdf79c2ed95dc322c7733dfffad669fb83948;hpb=32cc2c3ea0c359db529d048a4d2d16cb5d9ab168;p=lttng-ust.git diff --git a/doc/examples/java-log4j/Makefile b/doc/examples/java-log4j/Makefile index 59ffdf79..39c2e788 100644 --- 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)" "" - 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