X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=328dcf423be1e663d746c7ce45d423da4edecfb4;hb=9a79c612003362a97217613b7906a4782977d373;hp=655fea88dd641570a81c921b58d1ff6fbfbe1735;hpb=074c3a1bde68f3d2607c5c4711ec456dbdb05bce;p=userspace-rcu.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 655fea8..328dcf4 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,13 +1,10 @@
-if !LIBC_INCLUDES_PTHREAD
-AM_LDFLAGS=-lpthread
-endif
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
+AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
 
 SCRIPT_LIST = run.sh
 
 dist_noinst_SCRIPTS = $(SCRIPT_LIST)
 
-noinst_DATA = regression_tests.in
+dist_noinst_DATA = regression_tests.in
 
 noinst_PROGRAMS = test_urcu_fork \
 	rcutorture_urcu \
@@ -18,13 +15,13 @@ noinst_PROGRAMS = test_urcu_fork \
 
 noinst_HEADERS = rcutorture.h
 
-URCU_COMMON_LIB=$(top_builddir)/liburcu-common.la
-URCU_LIB=$(top_builddir)/liburcu.la
-URCU_QSBR_LIB=$(top_builddir)/liburcu-qsbr.la
-URCU_MB_LIB=$(top_builddir)/liburcu-mb.la
-URCU_SIGNAL_LIB=$(top_builddir)/liburcu-signal.la
-URCU_BP_LIB=$(top_builddir)/liburcu-bp.la
-URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la
+URCU_COMMON_LIB=$(top_builddir)/src/liburcu-common.la
+URCU_LIB=$(top_builddir)/src/liburcu.la
+URCU_QSBR_LIB=$(top_builddir)/src/liburcu-qsbr.la
+URCU_MB_LIB=$(top_builddir)/src/liburcu-mb.la
+URCU_SIGNAL_LIB=$(top_builddir)/src/liburcu-signal.la
+URCU_BP_LIB=$(top_builddir)/src/liburcu-bp.la
+URCU_CDS_LIB=$(top_builddir)/src/liburcu-cds.la
 TAP_LIB=$(top_builddir)/tests/utils/libtap.a
 
 test_urcu_fork_SOURCES = test_urcu_fork.c