From f21aa7d91c98ea2d7dd71f44c3dd3aa3c8583505 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 15 Jan 2014 09:09:00 -0500 Subject: [PATCH] tests: use common lib rather than recompile compat sources Signed-off-by: Mathieu Desnoyers --- tests/benchmark/Makefile.am | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index b07dc6e..7b45252 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -20,16 +20,6 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \ test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash \ test_urcu_lfs_rcu_dynlink -if COMPAT_ARCH -COMPAT=$(top_srcdir)/compat_arch_@ARCHTYPE@.c -else -COMPAT= -endif - -if COMPAT_FUTEX -COMPAT+=$(top_srcdir)/compat_futex.c -endif - URCU_COMMON_LIB=$(top_builddir)/liburcu-common.la URCU_LIB=$(top_builddir)/liburcu.la URCU_QSBR_LIB=$(top_builddir)/liburcu-qsbr.la @@ -162,14 +152,14 @@ test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c test_urcu_lfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_lfq_dynlink_LDADD = $(URCU_LIB) $(URCU_CDS_LIB) -test_urcu_wfq_SOURCES = test_urcu_wfq.c $(COMPAT) +test_urcu_wfq_SOURCES = test_urcu_wfq.c test_urcu_wfq_LDADD = $(URCU_COMMON_LIB) test_urcu_wfq_dynlink_SOURCES = test_urcu_wfq.c test_urcu_wfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_wfq_dynlink_LDADD = $(URCU_COMMON_LIB) -test_urcu_wfcq_SOURCES = test_urcu_wfcq.c $(COMPAT) +test_urcu_wfcq_SOURCES = test_urcu_wfcq.c test_urcu_wfcq_LDADD = $(URCU_COMMON_LIB) test_urcu_wfcq_dynlink_SOURCES = test_urcu_wfcq.c @@ -190,7 +180,7 @@ test_urcu_lfs_rcu_dynlink_SOURCES = test_urcu_lfs_rcu.c test_urcu_lfs_rcu_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_lfs_rcu_dynlink_LDADD = $(URCU_LIB) $(URCU_CDS_LIB) -test_urcu_wfs_SOURCES = test_urcu_wfs.c $(COMPAT) +test_urcu_wfs_SOURCES = test_urcu_wfs.c test_urcu_wfs_LDADD = $(URCU_COMMON_LIB) test_urcu_wfs_dynlink_SOURCES = test_urcu_wfs.c @@ -198,9 +188,9 @@ test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_wfs_dynlink_LDADD = $(URCU_COMMON_LIB) test_urcu_hash_SOURCES = test_urcu_hash.c test_urcu_hash.h \ - test_urcu_hash_rw.c test_urcu_hash_unique.c $(COMPAT) + test_urcu_hash_rw.c test_urcu_hash_unique.c test_urcu_hash_CFLAGS = -DRCU_QSBR $(AM_CFLAGS) -test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB) +test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_COMMON_LIB) $(URCU_CDS_LIB) .PHONY: bench -- 2.34.1