X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=dd383bc7ff8ddc3beedd9bd5b281261aabbc60ed;hb=b96787d23b84a303d49058c68c382c43b6b53625;hp=69801c0162a1bf24996de59a18469258492e2431;hpb=cd5de8df6ea38d5810c4abd92edf20a24179f0f5;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69801c01..dd383bc7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,16 @@
-SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint
+SUBDIRS = . hello hello-static-lib fork daemon
+#ust-basic-tracing ust-multi-test
+#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
+
+noinst_LIBRARIES = libtap.a
+
+libtap_a_SOURCES = \
+	tap.c \
+	tap.h
+