ust-fd: Add close_range declaration

[lttng-ust.git] / doc / examples / Makefile.am

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 06e40662f1004e8aa6a0234330bb79584c280fbe..aebf63bdf5bf11784d81aec5f767321a9a1d950f 100644 (file)
--- 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
@@ -18,18 +20,43 @@ dist_doc_examples_java_jul_DATA = java-jul/Makefile \
                                  java-jul/run \
                                  java-jul/ApplicationContextExample.java \
                                  java-jul/FilterChangeListenerExample.java \
-                                 java-jul/README
+                                 java-jul/README.md
 SUBDIRS_JUL = java-jul
 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 \
@@ -67,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 \
@@ -77,29 +104,29 @@ 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/demo-vtracef.c \
-       demo-tracef/README
+       demo-tracef/README.md
 
 dist_doc_examples_demo_tracelog_DATA = demo-tracelog/Makefile \
        demo-tracelog/demo-tracelog.c \
        demo-tracelog/demo-vtracelog.c \
-       demo-tracelog/README
+       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
 
 # Copies are for VPATH build support
 SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef clock-override \
@@ -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; \
@@ -142,7 +169,7 @@ all-local:
                                CFLAGS='$(CFLAGS)' \
                                AM_CFLAGS='$(AM_CFLAGS)' \
                                LDFLAGS="$(LDFLAGS)" \
-                               AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/liblttng-ust/.libs/"' \
+                               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)" \
@@ -155,8 +182,8 @@ all-local:
                                cd $$subdir && \
                                $(MAKE) all \
                                        CLASSPATH="$(CLASSPATH)" \
-                                       JAVA_CLASSPATH_OVERRIDE_JUL="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-jul" \
-                                       JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/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; \
@@ -167,8 +194,20 @@ all-local:
                                cd $$subdir && \
                                $(MAKE) all \
                                        CLASSPATH="$(CLASSPATH)" \
-                                       JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \
-                                       JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/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; \
@@ -176,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) \
                                        -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
-                                       -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/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)" \
@@ -215,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 \
@@ -223,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;