X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile.am;h=c92426b156ce72f809d24747641656040b569f93;hp=39ddb84d4acca66130084c709acbaf7a6b8e9e96;hb=98bc124a1949657d6af385f8b257af3a58957e51;hpb=bcb9d2bfa5a2b397d81c46e135b88bc94b99ca0f

diff --git a/Makefile.am b/Makefile.am
index 39ddb84..c92426b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,18 @@
 INCLUDES = -I$(top_builddir)/urcu
 
 AM_LDFLAGS=-lpthread
+AM_CFLAGS=-Wall
 
 SUBDIRS = . tests
 
 include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h
 nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
-		urcu/rculist.h urcu/system.h urcu/urcu-futex.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
 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 \
@@ -23,28 +29,40 @@ if COMPAT_FUTEX
 COMPAT+=compat_futex.c
 endif
 
-lib_LTLIBRARIES = liburcu.la liburcu-mb.la liburcu-defer.la liburcu-qsbr.la liburcu-bp.la
+lib_LTLIBRARIES = liburcu-cds.la liburcu.la liburcu-qsbr.la \
+		liburcu-mb.la liburcu-signal.la liburcu-bp.la
 
-liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-
-liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_mb_la_CFLAGS = -DURCU_MB
-
-liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
+liburcu_cds_la_SOURCES = wfqueue.c wfstack.c rculfqueue.c rculfstack.c \
+			$(COMPAT)
+liburcu_cds_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
-liburcu_defer_la_SOURCES = urcu-defer.c $(COMPAT)
+liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
+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_LIBADD = -lurcu-cds
+liburcu_qsbr_la_DEPENDENCIES = liburcu-cds.la
+liburcu_qsbr_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
-$(top_srcdir)/*.h $(top_srcdir)/*.c: urcu/arch.h urcu/uatomic_arch.h
+liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
+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)
 
-urcu/arch.h: $(top_srcdir)/urcu/arch_@ARCHTYPE@.h
-	$(mkdir_p) $(top_builddir)/urcu
-	cp -f $(top_srcdir)/urcu/arch_@ARCHTYPE@.h $(top_builddir)/urcu/arch.h
+liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
+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)
 
-urcu/uatomic_arch.h: $(top_srcdir)/urcu/uatomic_arch_@ARCHTYPE@.h
-	$(mkdir_p) $(top_builddir)/urcu
-	cp -f $(top_srcdir)/urcu/uatomic_arch_@ARCHTYPE@.h $(top_builddir)/urcu/uatomic_arch.h
+liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
+liburcu_bp_la_LIBADD = -lurcu-cds
+liburcu_bp_la_DEPENDENCIES = liburcu-cds.la
+liburcu_bp_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
 
-clean-local:
-	rm -f urcu/arch.h urcu/uatomic_arch.h
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
+	liburcu-signal.pc liburcu-mb.pc