X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2FMakefile.am;h=317edcb0b355e87bf51947ec2e8b4ea572a48b0b;hb=402147a0ffcc8fb0a1784a6d880fac318038e686;hp=526f81c789964bf545bd1e91d89dddac3e9ad498;hpb=48beefc91ce09133eac5a09bd856de83b86a54b6;p=lttng-ust.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 526f81c7..317edcb0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,14 @@
-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 same_line_tracepoint snprintf
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-lib_LTLIBRARIES = libtap.la
+dist_noinst_SCRIPTS = test_loop run.sh trace_matches unit_tests
 
-libtap_la_SOURCES = \
-	tap.c \
-	tap.h
+noinst_LIBRARIES = libtap.a
 
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
+libtap_a_SOURCES = tap.c tap.h
 
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file
+check-am:
+	./run.sh unit_tests