X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=6f0a31aa37d777498aa516d17ba836d35b4950b6;hb=a41cceb9344d8a42597b57b95d9a6dfe622ff87b;hp=8c4901bf433649566f0808ab27da1801428ff280;hpb=92414a62ab7538a9ff9bd65f4736145f4c422f71;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 8c4901bf..6f0a31aa 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -3,6 +3,15 @@ doc_examples_easy_ustdir = ${docdir}/examples/easy-ust
 doc_examples_gen_tpdir = ${docdir}/examples/gen-tp
 doc_examples_demodir = ${docdir}/examples/demo
 doc_examples_hello_static_libdir = ${docdir}/examples/hello-static-lib
+doc_examples_demo_tracefdir = ${docdir}/examples/demo-tracef
+
+if BUILD_JAVA_AGENT
+doc_examples_java_juldir = ${docdir}/examples/java-jul
+dist_doc_examples_java_jul_DATA = java-jul/Makefile \
+				  java-jul/Hello.java \
+				  java-jul/run
+SUBDIRS_JUL = java-jul
+endif
 
 dist_doc_examples_DATA = README
 
@@ -30,32 +39,66 @@ dist_doc_examples_hello_static_lib_DATA = hello-static-lib/Makefile \
 	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
+
 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 gen-tp hello-static-lib
+SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef
+
+if BUILD_GEN_TP_EXAMPLES
+SUBDIRS_PROXY += gen-tp
+endif
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		cp -f $(srcdir)/Makefile.examples.template $(builddir); \
-		for subdir in $(SUBDIRS_PROXY); do \
-			cp -fR $(srcdir)/$$subdir $(builddir); \
+		for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL); do \
+			cp -pfR $(srcdir)/$$subdir $(builddir); \
 		done; \
-	fi
+	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_CPPFLAGS="-I../../../include/" AM_LDFLAGS='-L../../../liblttng-ust/.libs/ -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../../tools/" $(AM_MAKEFLAGS) all; cd ..; \
-	done
+		(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; \
+	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; \
+		done; \
+	fi;
 
 clean-local:
-	for subdir in $(SUBDIRS_PROXY); do \
-		cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean; cd ..; \
-	done
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for subdir in $(SUBDIRS_PROXY); do \
+	@for subdir in $(SUBDIRS_PROXY); do \
+		if [ -d $$subdir ]; then \
+			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean && cd ..) || exit 1; \
+		fi; \
+	done; \
+	if [ x"$(SUBDIRS_JUL)" != x"" ]; then \
+		for subdir in $(SUBDIRS_JUL); do \
+			if [ -d $$subdir ]; then \
+				(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean && cd ..) || exit 1; \
+			fi; \
+		done; \
+	fi; \
+	if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL); do \
 			rm -rf $(builddir)/$$subdir; \
 		done; \
-		rm -f $(builddir)/Makefile.examples.template; \
-	fi
+	fi;
 endif