Fix: liblttng-ust-fork Makefile flags mismatch

[lttng-ust.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 43fb2036f3c080406527327c4051e019efa325a3..7365ce47335ac608eea27d57c4e819b155ed7945 100644 (file)
--- 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 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
 
-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