From: Mathieu Desnoyers Date: Wed, 15 Jan 2014 14:18:17 +0000 (-0500) Subject: tests regressions: use lib rather than recompile from source X-Git-Tag: v0.9.0~106 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b783aea4ff5879b0d201fa7ebe87642cabb3353e;p=userspace-rcu.git tests regressions: use lib rather than recompile from source Signed-off-by: Mathieu Desnoyers --- diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am index 80cb1bc..8dfe542 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am @@ -12,25 +12,6 @@ noinst_PROGRAMS = test_urcu_fork \ noinst_HEADERS = rcutorture.h -if COMPAT_ARCH -COMPAT=$(top_srcdir)/compat_arch_@ARCHTYPE@.c -else -COMPAT= -endif - -if COMPAT_FUTEX -COMPAT+=$(top_srcdir)/compat_futex.c -endif - -URCU=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) -URCU_QSBR=$(top_srcdir)/urcu-qsbr.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) -# URCU_MB uses urcu.c but -DRCU_MB must be defined -URCU_MB=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) -# URCU_SIGNAL uses urcu.c but -DRCU_SIGNAL must be defined -URCU_SIGNAL=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) -URCU_BP=$(top_srcdir)/urcu-bp.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) -URCU_DEFER=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) - URCU_COMMON_LIB=$(top_builddir)/liburcu-common.la URCU_LIB=$(top_builddir)/liburcu.la URCU_QSBR_LIB=$(top_builddir)/liburcu-qsbr.la @@ -39,11 +20,12 @@ URCU_SIGNAL_LIB=$(top_builddir)/liburcu-signal.la URCU_BP_LIB=$(top_builddir)/liburcu-bp.la URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la -test_urcu_fork_SOURCES = test_urcu_fork.c $(URCU) +test_urcu_fork_SOURCES = test_urcu_fork.c +test_urcu_fork_LDADD = $(URCU_LIB) rcutorture_urcu_SOURCES = urcutorture.c rcutorture_urcu_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS) -rcutorture_urcu_LDADD = $(URCU) +rcutorture_urcu_LDADD = $(URCU_LIB) rcutorture_urcu_mb_SOURCES = urcutorture.c rcutorture_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)