X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=849767a77e8a4ae96e6e5899a0191aa888a676c5;hp=0613bebd916f62d5eaed25cce8c9c2d03af8e926;hb=c0903f871e79d7dcec02deb2e2121be6bce16d9b;hpb=ffb12bdc29764f89f642d064daca941a5fd5c775

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 0613bebd..849767a7 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,19 +1,40 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
 
 noinst_LIBRARIES = libtestcommon.a
 
-libtestcommon_a_SOURCES = tap.c tap.h common.c common.h
+LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
-test_seeks_LDADD = libtestcommon.a \
+libtestcommon_a_SOURCES = common.c common.h
+
+# -Wl,--no-as-needed is needed for recent gold linker who seems to think
+# it knows better and considers libraries with constructors having
+# side-effects as dead code.
+test_seek_LDFLAGS = -Wl,--no-as-needed
+test_seek_LDADD = $(LIBTAP) libtestcommon.a \
 	$(top_builddir)/lib/libbabeltrace.la \
 	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
 
-noinst_PROGRAMS = test-seeks test-bitfield
+test_bitfield_LDADD = $(LIBTAP) libtestcommon.a
+
+noinst_PROGRAMS = test_seek test_bitfield
+
+test_seek_SOURCES = test_seek.c
+test_bitfield_SOURCES = test_bitfield.c
+
+SCRIPT_LIST = test_seek_big_trace test_seek_empty_packet
 
-test_seeks_SOURCES = test-seeks.c
-test_bitfield_SOURCES = test-bitfield.c
+dist_noinst_SCRIPTS = $(SCRIPT_LIST)
 
-EXTRA_DIST = README.tap runall.sh
+all-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(SCRIPT_LIST); do \
+			cp -f $(srcdir)/$$script $(builddir); \
+		done; \
+	fi
 
-check-am:
-	./runall.sh
+clean-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(SCRIPT_LIST); do \
+			rm -f $(builddir)/$$script; \
+		done; \
+	fi