X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=5bc1f4c9c2aeb350b3fe5899bcba7626fc7705c3;hb=50dbf18c8eda4940e03839c3eaea9f8d4a95b4cf;hp=9404054d207642ca0dcc054f292c780294ee5b00;hpb=be347eb9b64f54c37940f272ba70c74a2f8330a5;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 9404054d..5bc1f4c9 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
 
@@ -24,12 +28,37 @@ dist_doc_examples_java_log4j_DATA = java-log4j/Makefile \
 SUBDIRS_LOG4J = java-log4j
 endif
 
+if BUILD_PYTHON_AGENT
+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
 
@@ -82,8 +111,9 @@ endif
 
 all-local:
 	@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 \
 			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 \
@@ -105,14 +135,35 @@ all-local:
 	done; \
 	if [ x"$(SUBDIRS_JUL)" != x"" ]; then \
 		for subdir in $(SUBDIRS_JUL); do \
-			(cd $(SUBDIRS_JUL) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-java-agent/java" JAVA_JARFILE_OVERRIDE="liblttng-ust-agent.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
+			(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; \
 		done; \
 	fi; \
 	if [ x"$(SUBDIRS_LOG4J)" != x"" ]; then \
 		for subdir in $(SUBDIRS_LOG4J); do \
-			(cd $(SUBDIRS_LOG4J) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-java-agent/java" JAVA_JARFILE_OVERRIDE="liblttng-ust-agent.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
+			(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; \
 		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" \
+				-DCMAKE_C_COMPILER="$(CC)" \
+				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_CXX_COMPILER="$(CXX)" \
+				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+				.. && \
+				$(MAKE) && \
+				cd .. \
+			) || exit 1; \
+		done; \
+	fi;
+
 
 clean-local:
 	@for subdir in $(SUBDIRS_PROXY); do \
@@ -134,8 +185,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;