From: Mathieu Desnoyers Date: Fri, 10 Jun 2011 00:33:05 +0000 (-0400) Subject: Combine stack and queues info liburcu-cds.so X-Git-Tag: v0.6.0~20 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f48d08555a6ba4f690e80d40b1a2f178a3a1a27e;p=userspace-rcu.git Combine stack and queues info liburcu-cds.so Pretty much all libraries use a single .so for their data types. Do the same here. Signed-off-by: Mathieu Desnoyers --- diff --git a/Makefile.am b/Makefile.am index b0fcf1e..f39fdea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,36 +29,33 @@ if COMPAT_FUTEX COMPAT+=compat_futex.c endif -lib_LTLIBRARIES = liburcu.la liburcu-qsbr.la liburcu-mb.la liburcu-signal.la \ - liburcu-bp.la \ - libwfqueue.la libwfstack.la librculfqueue.la librculfstack.la +lib_LTLIBRARIES = liburcu-cds.la liburcu.la liburcu-qsbr.la \ + liburcu-mb.la liburcu-signal.la liburcu-bp.la + +liburcu_cds_la_SOURCES = wfqueue.c wfstack.c rculfqueue.c rculfstack.c \ + $(COMPAT) liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT) -liburcu_la_LIBADD = -lwfqueue -liburcu_la_DEPENDENCIES = libwfqueue.la +liburcu_la_LIBADD = -lurcu-cds +liburcu_la_DEPENDENCIES = liburcu-cds.la liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT) -liburcu_qsbr_la_LIBADD = -lwfqueue -liburcu_qsbr_la_DEPENDENCIES = libwfqueue.la +liburcu_qsbr_la_LIBADD = -lurcu-cds +liburcu_qsbr_la_DEPENDENCIES = liburcu-cds.la liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT) liburcu_mb_la_CFLAGS = -DRCU_MB -liburcu_mb_la_LIBADD = -lwfqueue -liburcu_mb_la_DEPENDENCIES = libwfqueue.la +liburcu_mb_la_LIBADD = -lurcu-cds +liburcu_mb_la_DEPENDENCIES = liburcu-cds.la liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT) liburcu_signal_la_CFLAGS = -DRCU_SIGNAL -liburcu_signal_la_LIBADD = -lwfqueue -liburcu_signal_la_DEPENDENCIES = libwfqueue.la +liburcu_signal_la_LIBADD = -lurcu-cds +liburcu_signal_la_DEPENDENCIES = liburcu-cds.la liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT) -liburcu_bp_la_CFLAGS = -lwfqueue -liburcu_bp_la_DEPENDENCIES = libwfqueue.la - -libwfqueue_la_SOURCES = wfqueue.c $(COMPAT) -libwfstack_la_SOURCES = wfstack.c $(COMPAT) -librculfqueue_la_SOURCES = rculfqueue.c $(COMPAT) -librculfstack_la_SOURCES = rculfstack.c $(COMPAT) +liburcu_bp_la_LIBADD = -lurcu-cds +liburcu_bp_la_DEPENDENCIES = liburcu-cds.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 5598689..3d68507 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,10 +42,7 @@ 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 -WFQUEUE_LIB=$(top_builddir)/libwfqueue.la -WFSTACK_LIB=$(top_builddir)/libwfstack.la -RCULFQUEUE_LIB=$(top_builddir)/librculfqueue.la -RCULFSTACK_LIB=$(top_builddir)/librculfstack.la +URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la EXTRA_DIST = $(top_srcdir)/tests/api_*.h @@ -95,23 +92,23 @@ test_perthreadlock_SOURCES = test_perthreadlock.c $(URCU_SIGNAL) rcutorture_urcu_SOURCES = urcutorture.c rcutorture_urcu_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS) -rcutorture_urcu_LDADD = $(URCU) $(WFQUEUE_LIB) +rcutorture_urcu_LDADD = $(URCU) $(URCU_CDS_LIB) rcutorture_urcu_mb_SOURCES = urcutorture.c rcutorture_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS) -rcutorture_urcu_mb_LDADD = $(URCU_MB_LIB) $(WFQUEUE_LIB) +rcutorture_urcu_mb_LDADD = $(URCU_MB_LIB) $(URCU_CDS_LIB) rcutorture_qsbr_SOURCES = urcutorture.c rcutorture_qsbr_CFLAGS = -DRCU_QSBR $(AM_CFLAGS) -rcutorture_qsbr_LDADD = $(URCU_QSBR_LIB) $(WFQUEUE_LIB) +rcutorture_qsbr_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB) rcutorture_urcu_signal_SOURCES = urcutorture.c rcutorture_urcu_signal_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS) -rcutorture_urcu_signal_LDADD = $(URCU_SIGNAL_LIB) $(WFQUEUE_LIB) +rcutorture_urcu_signal_LDADD = $(URCU_SIGNAL_LIB) $(URCU_CDS_LIB) rcutorture_urcu_bp_SOURCES = urcutorture.c rcutorture_urcu_bp_CFLAGS = -DRCU_BP $(AM_CFLAGS) -rcutorture_urcu_bp_LDADD = $(URCU_BP_LIB) $(WFQUEUE_LIB) +rcutorture_urcu_bp_LDADD = $(URCU_BP_LIB) $(URCU_CDS_LIB) test_mutex_SOURCES = test_mutex.c $(URCU) @@ -158,25 +155,25 @@ test_urcu_bp_SOURCES = test_urcu_bp.c $(URCU_BP) test_urcu_bp_dynamic_link_SOURCES = test_urcu_bp.c $(URCU_BP) test_urcu_bp_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) -test_urcu_lfq_SOURCES = test_urcu_lfq.c $(URCU_DEFER) -test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c $(URCU_DEFER) +test_urcu_lfq_SOURCES = test_urcu_lfq.c +test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c test_urcu_lfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) -test_urcu_lfq_dynlink_LDADD = $(RCULFQUEUE_LIB) +test_urcu_lfq_dynlink_LDADD = $(URCU_CDS_LIB) test_urcu_wfq_SOURCES = test_urcu_wfq.c test_urcu_wfq_dynlink_SOURCES = test_urcu_wfq.c test_urcu_wfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) -test_urcu_wfq_dynlink_LDADD = $(WFQUEUE_LIB) +test_urcu_wfq_dynlink_LDADD = $(URCU_CDS_LIB) test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU_DEFER) test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU_DEFER) test_urcu_lfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) -test_urcu_lfs_dynlink_LDADD = $(RCULFSTACK_LIB) +test_urcu_lfs_dynlink_LDADD = $(URCU_CDS_LIB) test_urcu_wfs_SOURCES = test_urcu_wfs.c test_urcu_wfs_dynlink_SOURCES = test_urcu_wfs.c test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) -test_urcu_wfs_dynlink_LDADD = $(WFSTACK_LIB) +test_urcu_wfs_dynlink_LDADD = $(URCU_CDS_LIB) urcutorture.c: api.h