X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile.am;h=ba0a131cc46caaae4a563e557930119fea7336d6;hp=f39fdea0087dfbaad0d9479ae74343ee3a2f5226;hb=e0ab43eb922df8fee5f28416d41fa3b2ca4a7a43;hpb=f48d08555a6ba4f690e80d40b1a2f178a3a1a27e

diff --git a/Makefile.am b/Makefile.am
index f39fdea..ba0a131 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,23 @@
 INCLUDES = -I$(top_builddir)/urcu
 
-AM_LDFLAGS=-lpthread
+#Add the -version-info directly here since we are only building
+# library that use the version-info
+AM_LDFLAGS=-lpthread -version-info $(URCU_LIBRARY_VERSION)
 AM_CFLAGS=-Wall
 
 SUBDIRS = . tests
 
-include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h
+include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
+		urcu-pointer.h urcu-qsbr.h
 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/rculist.h urcu/rcuhlist.h urcu/system.h 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
+		urcu/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.h \
+		urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h
+nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
 
-EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \
+EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \
 		gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \
 		README LICENSE compat_arch_x86.c
 
@@ -36,27 +38,22 @@ 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 = -lurcu-cds
-liburcu_la_DEPENDENCIES = liburcu-cds.la
+liburcu_la_LIBADD = liburcu-cds.la
 
 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_LIBADD = liburcu-cds.la
 
 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_LIBADD = liburcu-cds.la
 
 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_LIBADD = liburcu-cds.la
 
 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_LIBADD = liburcu-cds.la
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
-	liburcu-signal.pc liburcu-mb.pc 
+pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
+	liburcu-signal.pc liburcu-mb.pc