X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=ecb9fc6c4be9efc9c2da14bc40575215c2318448;hb=de6cb9d58c9d654b3e375835faf1f84294315cdd;hp=8e2aa8af84eed6ea858839405238b448a5610c4f;hpb=2875743718fb23293190b5edd0f2b530977270b1;p=urcu.git

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 8e2aa8a..ecb9fc6 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,8 +1,10 @@
 AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common
 
 LOG_DRIVER_FLAGS = --merge --comments
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/tests/utils/tap-driver.sh
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+	URCU_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+	URCU_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+	$(SHELL) $(top_srcdir)/tests/utils/tap-driver.sh
 
 noinst_PROGRAMS = \
 	test_arch \
@@ -105,33 +107,18 @@ test_urcu_multiflavor_single_unit_dynlink_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB)
 
 test_build_SOURCES = \
 	test_build.c
-test_build_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
+test_build_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)
 
 test_build_cxx_SOURCES = \
 	test_build_cxx.cpp
-test_build_cxx_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
+test_build_cxx_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)
 
 test_build_dynlink_SOURCES = \
 	test_build.c
 test_build_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
-test_build_dynlink_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
+test_build_dynlink_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)
 
 test_build_dynlink_cxx_SOURCES = \
 	test_build_cxx.cpp
 test_build_dynlink_cxx_CXXFLAGS = -DDYNAMIC_LINK_TEST $(AM_CXXFLAGS)
-test_build_dynlink_cxx_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
-
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
-
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
-
+test_build_dynlink_cxx_LDADD = $(URCU_COMMON_LIB) $(URCU_CDS_LIB) $(TAP_LIB)