X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile.am;h=5723b21b3412047472db61a28f8a8cf6e1727f0b;hp=702fd6f75c2db6db8fcc965eac87163e5cdce423;hb=af7c2dbeac32c663b64ad05e4eca70e18784463b;hpb=e7ca6e41edaf162282d378c4cef2c81801e8af18

diff --git a/Makefile.am b/Makefile.am
index 702fd6f..5723b21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,9 +10,7 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
 		urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/urcu-futex.h \
 		urcu/uatomic_generic.h urcu/arch_generic.h urcu/wfstack.h \
 		urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \
-		urcu/wfqueue-static.h urcu/wfstack-static.h \
-		urcu/rculfqueue-static.h urcu/rculfstack-static.h \
-		urcu/urcu_ref.h
+		urcu/urcu_ref.h urcu/map/*.h urcu/static/*.h
 nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h urcu/config.h
 
 EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \
@@ -29,29 +27,40 @@ 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_cds_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
 liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_la_CFLAGS = -lwfqueue
+liburcu_la_LIBADD = -lurcu-cds
+liburcu_la_DEPENDENCIES = liburcu-cds.la
+liburcu_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
 liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
-liburcu_qsbr_la_CFLAGS = -lwfqueue
+liburcu_qsbr_la_LIBADD = -lurcu-cds
+liburcu_qsbr_la_DEPENDENCIES = liburcu-cds.la
+liburcu_qsbr_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
 liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_mb_la_CFLAGS = -DRCU_MB -lwfqueue
+liburcu_mb_la_CFLAGS = -DRCU_MB
+liburcu_mb_la_LIBADD = -lurcu-cds
+liburcu_mb_la_DEPENDENCIES = liburcu-cds.la
+liburcu_mb_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
 liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_signal_la_CFLAGS = -DRCU_SIGNAL -lwfqueue
+liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
+liburcu_signal_la_LIBADD = -lurcu-cds
+liburcu_signal_la_DEPENDENCIES = liburcu-cds.la
+liburcu_signal_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
 liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
-liburcu_bp_la_CFLAGS = -lwfqueue
-
-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
+liburcu_bp_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liburcu.pc liburcu-bp.pc
+pkgconfig_DATA = liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
+	liburcu-signal.pc liburcu-mb.pc