From f4ac6e9595f53e30d4f1ac3784d84657abc83fcb Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 15 Jan 2014 09:01:56 -0500 Subject: [PATCH] urcu mb tests: use lib rather than recompile from source Signed-off-by: Mathieu Desnoyers --- tests/benchmark/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index 400fd9e..34251c7 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -31,8 +31,6 @@ COMPAT+=$(top_srcdir)/compat_futex.c 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 @@ -65,7 +63,8 @@ test_urcu_qsbr_timing_SOURCES = test_urcu_qsbr_timing.c 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) @@ -108,7 +107,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_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 @@ -125,7 +125,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_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 -- 2.34.1