X-Git-Url: https://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=2f9811ea4f9bfbc8b05e8e4644d4833d3996e2d0;hp=2f376e254d28fe6045badeeb7a949e62b1009568;hb=8aeb3cae3d7a1c2cf0fb24d8d83c94e32d5622dd;hpb=372587317b19636c05ce40cc1da40e2047481b81 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 2f376e25..2f9811ea 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -7,12 +7,16 @@ doc_examples_demo_tracefdir = ${docdir}/examples/demo-tracef doc_examples_demo_tracelogdir = ${docdir}/examples/demo-tracelog 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 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/run \ + java-jul/ApplicationContextExample.java \ + java-jul/FilterChangeListenerExample.java \ + java-jul/README SUBDIRS_JUL = java-jul endif @@ -29,12 +33,32 @@ doc_examples_pythondir = ${docdir}/examples/python dist_doc_examples_python_DATA = python/hello.py endif +if HAVE_CMAKE +if CXX_WORKS +SUBDIRS_CMAKE = cmake-multiple-shared-libraries +endif +endif + dist_doc_examples_DATA = README dist_doc_examples_easy_ust_DATA = easy-ust/Makefile \ easy-ust/sample.c \ easy-ust/sample_component_provider.h easy-ust/tp.c +dist_doc_examples_cmake_DATA = \ + cmake-multiple-shared-libraries/CMakeLists.txt \ + cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake \ + cmake-multiple-shared-libraries/aligner.cpp \ + cmake-multiple-shared-libraries/aligner-lib.cpp \ + cmake-multiple-shared-libraries/aligner-lib.h \ + cmake-multiple-shared-libraries/README.md \ + cmake-multiple-shared-libraries/tester.cpp \ + cmake-multiple-shared-libraries/tester-lib.cpp \ + cmake-multiple-shared-libraries/tester-lib.h \ + cmake-multiple-shared-libraries/tracepoint-provider.cpp \ + cmake-multiple-shared-libraries/tracepoint-provider.h \ + cmake-multiple-shared-libraries/trace.sh + dist_doc_examples_gen_tp_DATA = gen-tp/Makefile \ gen-tp/sample.c gen-tp/sample_tracepoint.tp @@ -73,10 +97,6 @@ dist_doc_examples_getcpu_override_DATA = getcpu-override/Makefile \ getcpu-override/run-getcpu-override \ getcpu-override/README -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 @@ -86,41 +106,60 @@ SUBDIRS_PROXY += gen-tp endif all-local: - @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J); do \ + $(AM_V_at)if [ x"$(srcdir)" != x"$(builddir)" ]; then \ + for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(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) AR="$(AR)" CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" AM_CPPFLAGS="$(AM_CPPFLAGS) -I$$rel_src_subdir$(top_srcdir)/include/ -I$$rel_build_subdir$(top_builddir)/include/" 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_V_P="$(AM_V_P)" AM_V_at="$(AM_V_at)" $(AM_MAKEFLAGS) all && cd ..) || 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) 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; \ 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) 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; \ + done; \ + fi; \ + if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \ + for subdir in $(SUBDIRS_CMAKE); do \ + ( \ + cd $$subdir && \ + $(MKDIR_P) build && \ + cd 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)/liblttng-ust/.libs" \ + -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \ + .. && \ + $(MAKE) && \ + cd .. \ + ) || 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; \ @@ -139,9 +178,15 @@ clean-local: fi; \ done; \ fi; \ + if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \ + for subdir in $(SUBDIRS_CMAKE); do \ + if [ -d $$subdir ]; then \ + (cd $$subdir && rm -rf build && cd ..) || exit 1; \ + fi; \ + done; \ + fi; \ if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J); do \ + for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(SUBDIRS_CMAKE); do \ rm -rf $(builddir)/$$subdir; \ done; \ fi; -endif