X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=7365ce47335ac608eea27d57c4e819b155ed7945;hb=00b217e613614b8addc4ee2bbcdec473275842fd;hp=4ab0b21bd78316f9e91624c0b9ac038ee54696e6;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4ab0b21b..7365ce47 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,10 @@
-SUBDIRS = . hello
-#SUBDIRS = . hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
+SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
+		demo daemon
+#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
+
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
 dist_noinst_SCRIPTS = test_loop runtests trace_matches