-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 common.c
+LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
-test_seeks_LDADD = libtestcommon.a \
+libtestcommon_a_SOURCES = common.c common.h
+
+test_seek_LDADD = $(LIBTAP) libtestcommon.a \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
-noinst_PROGRAMS = test-seeks
+test_bitfield_LDADD = $(LIBTAP) libtestcommon.a
+
+noinst_PROGRAMS = test_seek test_bitfield
+
+test_seek_SOURCES = test_seek.c
+test_bitfield_SOURCES = test_bitfield.c
-test_seeks_SOURCES = test-seeks.c
+EXTRA_DIST = runall.sh
check-am:
./runall.sh