urcu mb tests: use lib rather than recompile from source

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index 1c5ea3e19ae5bc370a83276db788e7cdf61038b3..7f7298c36da607580fd16bb792045564e695beef 100644 (file)
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -33,8 +33,6 @@ COMPAT+=$(top_srcdir)/compat_futex.c
 endif
 
 URCU=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT)
 endif
 
 URCU=$(top_srcdir)/urcu.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_COMMON_LIB=$(top_builddir)/liburcu-common.la
 URCU_LIB=$(top_builddir)/liburcu.la
 
 URCU_COMMON_LIB=$(top_builddir)/liburcu-common.la
 URCU_LIB=$(top_builddir)/liburcu.la


@@ -67,7 +65,8 @@ test_urcu_qsbr_timing_SOURCES = test_urcu_qsbr_timing.c
 test_urcu_qsbr_timing_LDADD = $(URCU_QSBR_LIB)
 
 
 test_urcu_qsbr_timing_LDADD = $(URCU_QSBR_LIB)
 
 

-test_urcu_mb_SOURCES = test_urcu.c $(URCU_MB)
+test_urcu_mb_SOURCES = test_urcu.c
+test_urcu_mb_LDADD = $(URCU_MB_LIB)

 test_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 
 
 test_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 
 


@@ -110,7 +109,8 @@ test_urcu_signal_gc_SOURCES = test_urcu_gc.c
 test_urcu_signal_gc_LDADD = $(URCU_SIGNAL_LIB)
 test_urcu_signal_gc_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
 
 test_urcu_signal_gc_LDADD = $(URCU_SIGNAL_LIB)
 test_urcu_signal_gc_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
 

-test_urcu_mb_gc_SOURCES = test_urcu_gc.c $(URCU_MB)
+test_urcu_mb_gc_SOURCES = test_urcu_gc.c
+test_urcu_mb_gc_LDADD = $(URCU_MB_LIB)

 test_urcu_mb_gc_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 
 test_urcu_qsbr_gc_SOURCES = test_urcu_qsbr_gc.c
 test_urcu_mb_gc_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 
 test_urcu_qsbr_gc_SOURCES = test_urcu_qsbr_gc.c


@@ -127,7 +127,8 @@ test_urcu_signal_lgc_SOURCES = test_urcu_gc.c
 test_urcu_signal_lgc_LDADD = $(URCU_SIGNAL_LIB)
 test_urcu_signal_lgc_CFLAGS = -DRCU_SIGNAL -DTEST_LOCAL_GC $(AM_CFLAGS)
 
 test_urcu_signal_lgc_LDADD = $(URCU_SIGNAL_LIB)
 test_urcu_signal_lgc_CFLAGS = -DRCU_SIGNAL -DTEST_LOCAL_GC $(AM_CFLAGS)
 

-test_urcu_mb_lgc_SOURCES = test_urcu_gc.c $(URCU_MB)
+test_urcu_mb_lgc_SOURCES = test_urcu_gc.c
+test_urcu_mb_lgc_LDADD = $(URCU_MB_LIB)

 test_urcu_mb_lgc_CFLAGS = -DTEST_LOCAL_GC -DRCU_MB $(AM_CFLAGS)
 
 test_urcu_qsbr_dynamic_link_SOURCES = test_urcu_qsbr.c
 test_urcu_mb_lgc_CFLAGS = -DTEST_LOCAL_GC -DRCU_MB $(AM_CFLAGS)
 
 test_urcu_qsbr_dynamic_link_SOURCES = test_urcu_qsbr.c