X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=7365ce47335ac608eea27d57c4e819b155ed7945;hb=refs%2Fheads%2Fstable-2.1;hp=526f81c789964bf545bd1e91d89dddac3e9ad498;hpb=48beefc91ce09133eac5a09bd856de83b86a54b6;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 526f81c7..7365ce47 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +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 ustcmd_function_tests
+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
 
-lib_LTLIBRARIES = libtap.la
+noinst_LIBRARIES = libtap.a
 
-libtap_la_SOURCES = \
+libtap_a_SOURCES = \
 	tap.c \
 	tap.h
 
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
-
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file