-AM_LDFLAGS=-lpthread
-
-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
-nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h
-
-EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \
+#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 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/futex.h \
+ urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \
+ urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.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 \
+ urcu/rculfhash.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/*.h \