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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 526f81c7..377acd67 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,27 @@
-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 = utils hello same_line_tracepoint snprintf benchmark ust-elf \
+		ctf-types test-app-ctx
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+if CXX_WORKS
+SUBDIRS += hello.cxx
+endif
 
-lib_LTLIBRARIES = libtap.la
+SCRIPT_LIST = test_loop run.sh unit_tests
 
-libtap_la_SOURCES = \
-	tap.c \
-	tap.h
+dist_noinst_SCRIPTS = $(SCRIPT_LIST)
 
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
+all-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(SCRIPT_LIST); do \
+			cp -f $(srcdir)/$$script $(builddir); \
+		done; \
+	fi
 
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file
+clean-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(SCRIPT_LIST); do \
+			rm -f $(builddir)/$$script; \
+		done; \
+	fi
+
+check-am:
+	./run.sh unit_tests