X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=aebf63bdf5bf11784d81aec5f767321a9a1d950f;hb=HEAD;hp=3cb3e3d7b12c031133fc93211412440c887fc952;hpb=0363661e12053e578f5cae7e29108c7029ed74ae;p=lttng-ust.git diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 3cb3e3d7..aebf63bd 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 EfficiOS, Inc +# +# SPDX-License-Identifier: LGPL-2.1-only + doc_examplesdir = ${docdir}/examples doc_examples_easy_ustdir = ${docdir}/examples/easy-ust doc_examples_gen_tpdir = ${docdir}/examples/gen-tp @@ -9,26 +13,51 @@ doc_examples_clock_overridedir = ${docdir}/examples/clock-override doc_examples_getcpu_overridedir = ${docdir}/examples/getcpu-override doc_examples_cmakedir = ${docdir}/examples/cmake-multiple-shared-libraries -if BUILD_JAVA_AGENT_WITH_JUL +if ENABLE_JAVA_AGENT_WITH_JUL doc_examples_java_juldir = ${docdir}/examples/java-jul dist_doc_examples_java_jul_DATA = java-jul/Makefile \ java-jul/Hello.java \ java-jul/run \ java-jul/ApplicationContextExample.java \ java-jul/FilterChangeListenerExample.java \ - java-jul/README + java-jul/README.md SUBDIRS_JUL = java-jul endif -if BUILD_JAVA_AGENT_WITH_LOG4J +if ENABLE_JAVA_AGENT_WITH_LOG4J doc_examples_java_log4jdir = ${docdir}/examples/java-log4j dist_doc_examples_java_log4j_DATA = java-log4j/Makefile \ - java-log4j/Hello.java \ - java-log4j/run + java-log4j/HelloLog4j.java \ + java-log4j/run SUBDIRS_LOG4J = java-log4j endif -if BUILD_PYTHON_AGENT +if ENABLE_JAVA_AGENT_WITH_LOG4J2 +doc_examples_java_log4j2_basicdir = ${docdir}/examples/java-log4j2-basic +dist_doc_examples_java_log4j2_basic_DATA = \ + java-log4j2-basic/Makefile \ + java-log4j2-basic/HelloLog4j2.java \ + java-log4j2-basic/log4j2.xml \ + java-log4j2-basic/run + +doc_examples_java_log4j2_ctxdir = ${docdir}/examples/java-log4j2-ctx +dist_doc_examples_java_log4j2_ctx_DATA = \ + java-log4j2-ctx/Makefile \ + java-log4j2-ctx/HelloLog4j2Ctx.java \ + java-log4j2-ctx/log4j2.ctx1.xml \ + java-log4j2-ctx/log4j2.ctx2.xml \ + java-log4j2-ctx/run + +doc_examples_java_log4j2_progdir = ${docdir}/examples/java-log4j2-prog +dist_doc_examples_java_log4j2_prog_DATA = \ + java-log4j2-prog/Makefile \ + java-log4j2-prog/HelloLog4j2Prog.java \ + java-log4j2-prog/run + +SUBDIRS_LOG4J2 = java-log4j2-basic java-log4j2-prog +endif + +if ENABLE_PYTHON_AGENT doc_examples_pythondir = ${docdir}/examples/python dist_doc_examples_python_DATA = python/hello.py endif @@ -39,7 +68,7 @@ SUBDIRS_CMAKE = cmake-multiple-shared-libraries endif endif -dist_doc_examples_DATA = README +dist_doc_examples_DATA = README.md dist_doc_examples_easy_ust_DATA = easy-ust/Makefile \ easy-ust/sample.c \ @@ -65,7 +94,7 @@ dist_doc_examples_gen_tp_DATA = gen-tp/Makefile \ dist_doc_examples_demo_DATA = demo/demo.c \ demo/demo-trace \ demo/Makefile \ - demo/README \ + demo/README.md \ demo/tp2.c \ demo/tp3.c \ demo/tp.c \ @@ -75,83 +104,137 @@ dist_doc_examples_demo_DATA = demo/demo.c \ dist_doc_examples_hello_static_lib_DATA = hello-static-lib/Makefile \ hello-static-lib/hello.c \ - hello-static-lib/README \ + hello-static-lib/README.md \ hello-static-lib/ust_tests_hello.h \ hello-static-lib/tp.c dist_doc_examples_demo_tracef_DATA = demo-tracef/Makefile \ demo-tracef/demo-tracef.c \ - demo-tracef/README + demo-tracef/demo-vtracef.c \ + demo-tracef/README.md dist_doc_examples_demo_tracelog_DATA = demo-tracelog/Makefile \ demo-tracelog/demo-tracelog.c \ - demo-tracelog/README + demo-tracelog/demo-vtracelog.c \ + demo-tracelog/README.md dist_doc_examples_clock_override_DATA = clock-override/Makefile \ clock-override/lttng-ust-clock-override-example.c \ clock-override/run-clock-override \ - clock-override/README + clock-override/README.md dist_doc_examples_getcpu_override_DATA = getcpu-override/Makefile \ getcpu-override/lttng-ust-getcpu-override-example.c \ getcpu-override/run-getcpu-override \ - getcpu-override/README + getcpu-override/README.md -if NO_SHARED -# Don't build examples if shared libraries support was explicitly -# disabled. -else # Copies are for VPATH build support SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef clock-override \ getcpu-override demo-tracelog -if BUILD_GEN_TP_EXAMPLES +if ENABLE_GEN_TP_EXAMPLES SUBDIRS_PROXY += gen-tp endif all-local: - @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(SUBDIRS_CMAKE); do \ + $(AM_V_at)if [ x"$(srcdir)" != x"$(builddir)" ]; then \ + for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(SUBDIRS_LOG4J2) $(SUBDIRS_CMAKE); do \ cp -pfR $(srcdir)/$$subdir $(builddir); \ chmod -R u+w $(builddir)/$$subdir; \ done; \ fi; \ if [ x"$(shell echo "$(top_srcdir)" | grep "^/" | wc -l)" = x"1" ]; then \ - echo "Examples: absolute top_srcdir path $(top_srcdir)"; \ rel_src_subdir=""; \ else \ - echo "Examples: relative top_srcdir path $(top_srcdir)"; \ rel_src_subdir="../"; \ fi; \ if [ x"$(shell echo "$(top_builddir)" | grep "^/" | wc -l)" = x"1" ]; then \ - echo "Examples: absolute top_builddir path $(top_builddir)"; \ rel_build_subdir=""; \ else \ - echo "Examples: relative top_builddir path $(top_builddir)"; \ rel_build_subdir="../"; \ fi; \ for subdir in $(SUBDIRS_PROXY); do \ - (cd $$subdir && $(MAKE) AM_CC="$(CC)" AM_CPPFLAGS="$(CPPFLAGS) -I$$rel_src_subdir$(top_srcdir)/include/ -I$$rel_build_subdir$(top_builddir)/include/" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../../tools/" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \ + ( \ + cd $$subdir && \ + $(MAKE) all \ + AR="$(AR)" \ + CC="$(CC)" \ + PYTHON="$(PYTHON)" \ + CPPFLAGS="$(CPPFLAGS)" \ + AM_CPPFLAGS="$(AM_CPPFLAGS) \ + -I$$rel_src_subdir$(top_srcdir)/include/ \ + -I$$rel_build_subdir$(top_builddir)/include/ \ + -I$$rel_src_subdir$(top_srcdir)/src/ \ + -I$$rel_build_subdir$(top_builddir)/src/" \ + CFLAGS='$(CFLAGS)' \ + AM_CFLAGS='$(AM_CFLAGS)' \ + LDFLAGS="$(LDFLAGS)" \ + AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \ + LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ + AM_V_P="$(AM_V_P)" \ + AM_V_at="$(AM_V_at)" \ + $(AM_MAKEFLAGS) \ + ) || exit 1; \ done; \ if [ x"$(SUBDIRS_JUL)" != x"" ]; then \ for subdir in $(SUBDIRS_JUL); do \ - (cd $(SUBDIRS_JUL) && $(MAKE) 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) all && cd ..) || exit 1; \ + ( \ + cd $$subdir && \ + $(MAKE) all \ + CLASSPATH="$(CLASSPATH)" \ + JAVA_CLASSPATH_OVERRIDE_JUL="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \ + $(AM_MAKEFLAGS) \ + ) || exit 1; \ done; \ fi; \ if [ x"$(SUBDIRS_LOG4J)" != x"" ]; then \ for subdir in $(SUBDIRS_LOG4J); do \ - (cd $(SUBDIRS_LOG4J) && $(MAKE) 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) all && cd ..) || exit 1; \ + ( \ + cd $$subdir && \ + $(MAKE) all \ + CLASSPATH="$(CLASSPATH)" \ + JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \ + $(AM_MAKEFLAGS) \ + ) || exit 1; \ done; \ - fi; + fi; \ + if [ x"$(SUBDIRS_LOG4J2)" != x"" ]; then \ + for subdir in $(SUBDIRS_LOG4J2); do \ + ( \ + cd $$subdir && \ + $(MAKE) all \ + CLASSPATH="$(CLASSPATH)" \ + JAVA_CLASSPATH_OVERRIDE_LOG4J2="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \ + $(AM_MAKEFLAGS) \ + ) || exit 1; \ + done; \ + fi; \ if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \ for subdir in $(SUBDIRS_CMAKE); do \ - (cd $(SUBDIRS_CMAKE) && mkdir -p build && cd build && cmake -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" .. && $(MAKE) && cd ..) || exit 1; \ + ( \ + $(MKDIR_P) $$subdir/build && \ + cd $$subdir/build && \ + AR="$(AR)" \ + CC="$(CC)" \ + CXX="$(CXX)" \ + $(CMAKE) \ + -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ + -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs" \ + -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \ + .. && \ + $(MAKE) \ + ) || exit 1; \ done; \ fi; clean-local: - @for subdir in $(SUBDIRS_PROXY); do \ + $(AM_V_at)for subdir in $(SUBDIRS_PROXY); do \ if [ -d $$subdir ]; then \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean && cd ..) || exit 1; \ fi; \ @@ -170,6 +253,13 @@ clean-local: fi; \ done; \ fi; \ + if [ x"$(SUBDIRS_LOG4J2)" != x"" ]; then \ + for subdir in $(SUBDIRS_LOG4J2); do \ + if [ -d $$subdir ]; then \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean && cd ..) || exit 1; \ + fi; \ + done; \ + fi; \ if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \ for subdir in $(SUBDIRS_CMAKE); do \ if [ -d $$subdir ]; then \ @@ -178,8 +268,7 @@ clean-local: done; \ fi; \ if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(SUBDIRS_CMAKE); do \ + for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(SUBDIRS_LOG4J2) $(SUBDIRS_CMAKE); do \ rm -rf $(builddir)/$$subdir; \ done; \ fi; -endif