X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2FMakefile.am;h=6237b1610653c12b90f957817fd7e2d1bfc5979e;hp=9bca8809a058cf7547339e8db62c5220ae7d9575;hb=3f7f208a0150d93363cbf7755e890a9839114ab5;hpb=9ac429ef32142eaecfec2d1a44569464c4f8f721

diff --git a/tests/regression/ust/Makefile.am b/tests/regression/ust/Makefile.am
index 9bca8809a..6237b1610 100644
--- a/tests/regression/ust/Makefile.am
+++ b/tests/regression/ust/Makefile.am
@@ -1,28 +1,28 @@
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \
-		  overlap
+		overlap buffers-pid linking daemon exit-fast fork libc-wrapper \
+		periodical-metadata-flush java-jul java-log4j python-logging \
+		getcpu-override clock-override type-declarations \
+		rotation-destroy-flush blocking multi-lib
 
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils -I$(top_srcdir)/src -g -Wall
-AM_LDFLAGS = -lurcu -lurcu-cds
-
-EXTRA_DIST = runall.sh run-ust-global-tests.sh
-
-noinst_PROGRAMS = ust_global_event_basic ust_global_event_wildcard
-
-UTILS=$(top_srcdir)/tests/utils/utils.h
-LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
-
-SESSIONDSRC=$(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \
-		 $(top_srcdir)/src/common/sessiond-comm/unix.c \
-		 $(top_srcdir)/src/common/sessiond-comm/inet.c \
-		 $(top_srcdir)/src/common/sessiond-comm/inet6.c
-
-ust_global_event_wildcard_SOURCES = ust_global_event_wildcard.c $(UTILS) \
-		$(SESSIONDSRC)
-ust_global_event_wildcard_LDADD = $(LIBLTTNG)
+if HAVE_OBJCOPY
+SUBDIRS += baddr-statedump ust-dl
+endif
 
-ust_global_event_basic_SOURCES = ust_global_event_basic.c $(UTILS) \
-		$(SESSIONDSRC)
-ust_global_event_basic_LDADD = $(LIBLTTNG)
+EXTRA_DIST = test_event_basic test_event_tracef test_event_perf
+
+all-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(EXTRA_DIST); do \
+			cp -f $(srcdir)/$$script $(builddir); \
+		done; \
+	fi
+
+clean-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(EXTRA_DIST); do \
+			rm -f $(builddir)/$$script; \
+		done; \
+	fi
 
 endif