Add back uatomic_arch.h for slow deprecation process

[urcu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e85c924e1ca499a4fafa3e1166249d5e389a88d2..ba0a131cc46caaae4a563e557930119fea7336d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +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/urcu_ref.h urcu/map/*.h urcu/static/*.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
 
@@ -32,35 +36,24 @@ lib_LTLIBRARIES = liburcu-cds.la liburcu.la liburcu-qsbr.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_LIBADD = -lurcu-cds
-liburcu_la_DEPENDENCIES = liburcu-cds.la
-liburcu_la_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
+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_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
+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_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
+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_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
+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_LDFLAGS = -version-info $(URCU_LIBRARY_VERSION)
+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