Consolidate _LIBADD and _DEPENDENCIES in Makefile.am

[urcu.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3c06a2eb70b7933082ae846e83d8a1c9817f7e3a..fb1707a1bd08c8345224088fb4180151adfa9e60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ 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/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.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 \
@@ -37,26 +37,21 @@ 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 \