X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=doc%2Fexamples%2FMakefile.am;h=73fadf5a3f0dea3f97aa4b879948d78914112f12;hb=9f47aac89a87197f5f1ea18acdc160087ac58397;hp=503ee81509dd5be46b7e5a70f53592326fb1b1ff;hpb=c7193abd8d7cd229a17493a80e8d7e5f5a3637c1;p=lttng-ust.git diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 503ee815..73fadf5a 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -149,6 +149,7 @@ all-local: ( \ cd $$subdir && \ $(MAKE) all \ + CLASSPATH="$(CLASSPATH)" \ JAVA_CLASSPATH_OVERRIDE_JUL="../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul" \ JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \ $(AM_MAKEFLAGS) \ @@ -160,6 +161,7 @@ all-local: ( \ cd $$subdir && \ $(MAKE) all \ + CLASSPATH="$(CLASSPATH)" \ JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \ JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \ $(AM_MAKEFLAGS) \ @@ -178,8 +180,8 @@ all-local: cmake \ -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \ - -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ + -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \ .. && \ $(MAKE) \