X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=e7010a75a9229305704ea7eed80c8e3893d06547;hb=8091b5d576a6053856e373c27ec0b2bdb01f428f;hp=a7f52a04f7c69705288614c1c1e05d9b84a1ed87;hpb=41ad81d87d649dd658ef0305d3abc987abb3fc5d;p=lttng-ust.git diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index a7f52a04..e7010a75 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2023 EfficiOS, Inc +# # SPDX-License-Identifier: LGPL-2.1-only doc_examplesdir = ${docdir}/examples @@ -25,11 +27,36 @@ endif 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 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 @@ -41,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 \ @@ -111,7 +138,7 @@ endif all-local: $(AM_V_at)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 \ cp -pfR $(srcdir)/$$subdir $(builddir); \ chmod -R u+w $(builddir)/$$subdir; \ done; \ @@ -132,15 +159,18 @@ all-local: $(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_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../../../liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../liblttng-ust/.libs/"' \ - LTTNG_GEN_TP_PATH="../../../tools/" \ + 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) \ @@ -152,8 +182,8 @@ 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" \ + 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; \ @@ -164,8 +194,20 @@ 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" \ + 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; \ + 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; \ @@ -173,15 +215,14 @@ all-local: if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \ for subdir in $(SUBDIRS_CMAKE); do \ ( \ - cd $$subdir && \ - $(MKDIR_P) build && \ - cd build && \ + $(MKDIR_P) $$subdir/build && \ + cd $$subdir/build && \ AR="$(AR)" \ CC="$(CC)" \ CXX="$(CXX)" \ - cmake \ + $(CMAKE) \ -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ - -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \ + -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)" \ @@ -212,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 \ @@ -220,7 +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;